From da49e1b47c566cbb9bccbce7d823dcc9bede0543 Mon Sep 17 00:00:00 2001
From: Phil Rzewski <phil@brimsecurity.com>
Date: Mon, 21 Dec 2020 10:51:10 -0800
Subject: [PATCH] Update zq to v0.26.0 and prep v0.21.1 (#1294)

https://github.com/brimsec/brim/compare/v0.21.0...841244c
---
 CHANGELOG.md      | 3 +++
 package-lock.json | 6 +++---
 package.json      | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 507a7a24e9..fe907ab731 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v0.21.1
+* Update zq to [v0.26.0](https://github.com/brimsec/zq/releases/tag/v0.26.0), which fixes an issue that was causing pcap import failures, and also delivers other enhancements
+
 ## v0.21.0
 **NOTE** - The Brim v0.21.0 release includes initial support for the
 automatic generation of [Suricata](https://suricata-ids.org/) alerts from imported pcaps.
diff --git a/package-lock.json b/package-lock.json
index 9f627aea9b..ef79604cae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Brim",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -20558,8 +20558,8 @@
       }
     },
     "zq": {
-      "version": "git+https://github.com/brimsec/zq.git#cc0fd85093d3ee57e949766625e05c59f278ee2b",
-      "from": "git+https://github.com/brimsec/zq.git#cc0fd85093d3ee57e949766625e05c59f278ee2b"
+      "version": "git+https://github.com/brimsec/zq.git#fc90da422f847cff90c15cc3aa4763a183de4b38",
+      "from": "git+https://github.com/brimsec/zq.git#v0.26.0"
     }
   }
 }
diff --git a/package.json b/package.json
index d0a38fb744..903267da4a 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.21.0",
+  "version": "0.21.1",
   "main": "dist/js/electron/main.js",
   "author": "Brim Security, Inc.",
   "bin": {
@@ -180,7 +180,7 @@
     "styled-components": "^5.1.1",
     "valid-url": "^1.0.9",
     "zealot": "file:zealot",
-    "zq": "git+https://github.com/brimsec/zq.git#cc0fd85093d3ee57e949766625e05c59f278ee2b"
+    "zq": "git+https://github.com/brimsec/zq.git#v0.26.0"
   },
   "optionalDependencies": {
     "electron-installer-debian": "^3.0.0",