From ae00f1fc4619005e25300ac0a16ce96b60d68242 Mon Sep 17 00:00:00 2001
From: Phil Rzewski <phil@brimsecurity.com>
Date: Fri, 12 Jun 2020 15:31:06 -0700
Subject: [PATCH] Update zq to v0.15.0 and prep v0.11.0 (#874)

---
 CHANGELOG.md      | 5 +++++
 package-lock.json | 4 ++--
 package.json      | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9969d4407f..83b7781924 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v0.11.0
+* Update zq to [v0.15.0](https://github.com/brimsec/zq/releases/tag/v0.15.0), which fixes [an issue with ZNG export](https://github.com/brimsec/brim/issues/814#issuecomment-636130351)
+* Update Zeek to [v3.2.0-dev-brim3](https://github.com/brimsec/zeek/releases/tag/v3.2.0-dev-brim3), which adds [JA3](https://github.com/salesforce/ja3) and [HASSH](https://github.com/salesforce/hassh) support for pcaps imported into Brim (#861)
+* Provide notification on Linux when a new Brim version is available for download (#870)
+
 ## v0.10.0
 * Update zq to [v0.14.0](https://github.com/brimsec/zq/releases/tag/v0.14.0)
 * Update Zeek to [v3.2.0-dev-brim2](https://github.com/brimsec/zeek/releases/tag/v3.2.0-dev-brim2), with the following platform specific changes:
diff --git a/package-lock.json b/package-lock.json
index 44348ea92a..83166bc9ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Brim",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -17015,7 +17015,7 @@
     },
     "zq": {
       "version": "git+https://github.com/brimsec/zq.git#ea81bd973b8520c2fc44da742b64817ae8b387e1",
-      "from": "git+https://github.com/brimsec/zq.git#ea81bd973b8520c2fc44da742b64817ae8b387e1"
+      "from": "git+https://github.com/brimsec/zq.git#v0.15.0"
     }
   }
 }
diff --git a/package.json b/package.json
index 91d3eb2aa5..8e267487a0 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.10.0",
+  "version": "0.11.0",
   "main": "dist/js/electron/main.js",
   "author": "Brim Security, Inc.",
   "bin": {
@@ -153,7 +153,7 @@
     "source-map-support": "^0.5.16",
     "styled-components": "^5.1.0",
     "valid-url": "^1.0.9",
-    "zq": "git+https://github.com/brimsec/zq.git#ea81bd973b8520c2fc44da742b64817ae8b387e1"
+    "zq": "git+https://github.com/brimsec/zq.git#v0.15.0"
   },
   "optionalDependencies": {
     "electron-installer-debian": "^3.0.0",