summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-03-06 14:37:44 +0000
committerNick Thomas <nick@gitlab.com>2019-03-06 14:37:44 +0000
commit6109b64ed81f80e90bf094ad1f1ded8f5e5f8324 (patch)
treec3514973098040d1557ada5bc120f290f28df110
parentdb6056410480fb9b3e1e336abdaa785cc2d46dcf (diff)
parent0eab4ae6ea5b7d1ff088238a6a150dbc26b19a9c (diff)
downloadgitlab-shell-6109b64ed81f80e90bf094ad1f1ded8f5e5f8324.tar.gz
Merge branch 'release-8-7-1' into 'master'v8.7.1
Release v8.7.1 See merge request gitlab-org/gitlab-shell!281
-rw-r--r--CHANGELOG3
-rw-r--r--VERSION2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c0e08e5..4396dd2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v8.7.1
+ - Fix unmarshalling JSON from the command line !280
+
v8.7.0
- Add distributed tracing to GitLab-Shell !277
diff --git a/VERSION b/VERSION
index df5119e..d139a75 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.7.0
+8.7.1