From 05b679d16bca030483dd2e4b86657fed17b227ca Mon Sep 17 00:00:00 2001
From: Phil Rzewski <phil@brimsecurity.com>
Date: Fri, 25 Sep 2020 17:26:03 -0700
Subject: [PATCH] Update zq to v0.22.0 and prep v0.18.0 (#1097)

https://github.com/brimsec/brim/compare/v0.17.0...0b26536
---
 CHANGELOG.md      | 10 ++++++++++
 package-lock.json |  4 ++--
 package.json      |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddfbe53e97..ddd4ae720d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## v0.18.0
+* Update zq to [v0.22.0](https://github.com/brimsec/zq/releases/tag/v0.22.0)
+* Update Zeek to [v3.2.0-dev-brim10](https://github.com/brimsec/zeek/releases/tag/v3.2.0-dev-brim10) to take advantage of latest [geolocation](https://github.com/brimsec/brim/wiki/Geolocation) data (#1096)
+* Move the code base from Flow to TypeScript (#1075)
+* Point to new Slack community URL https://www.brimsecurity.com/join-slack/ (#1089)
+* Show a spinner if there's delays closing the "new connection" modal (#1084)
+* Add a right-click option to delete all Spaces (#1078)
+* Organize History entries by unique Space/Connection combination (#1078)
+* Fix an issue where closing Brim after having searched a remote Space caused a "Space does not exist" error when Brim was relaunched (#1091)
+
 ## v0.17.0
 * Update zq to [v0.21.0](https://github.com/brimsec/zq/releases/tag/v0.21.0)
 * Update Zeek to [v3.2.0-dev-brim9](https://github.com/brimsec/zeek/releases/tag/v3.2.0-dev-brim9) to take advantage of latest [geolocation](https://github.com/brimsec/brim/wiki/Geolocation) data (#1071)
diff --git a/package-lock.json b/package-lock.json
index 4c5bd835ae..bd3ad7c952 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Brim",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -20208,7 +20208,7 @@
     },
     "zq": {
       "version": "git+https://github.com/brimsec/zq.git#d73171bb7aeb00573c46d75f2b0819a05edfc674",
-      "from": "git+https://github.com/brimsec/zq.git#d73171bb7aeb00573c46d75f2b0819a05edfc674"
+      "from": "git+https://github.com/brimsec/zq.git#v0.22.0"
     }
   }
 }
diff --git a/package.json b/package.json
index 04f426288e..25b67abb14 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "Brim Desktop App",
   "repository": "https://github.com/brimsec/brim",
   "license": "BSD-3-Clause",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "main": "dist/js/electron/main.js",
   "author": "Brim Security, Inc.",
   "bin": {
@@ -173,7 +173,7 @@
     "styled-components": "^5.1.1",
     "valid-url": "^1.0.9",
     "zealot": "file:zealot",
-    "zq": "git+https://github.com/brimsec/zq.git#d73171bb7aeb00573c46d75f2b0819a05edfc674"
+    "zq": "git+https://github.com/brimsec/zq.git#v0.22.0"
   },
   "optionalDependencies": {
     "electron-installer-debian": "^3.0.0",