summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-09-01 13:39:49 +0000
committerNick Thomas <nick@gitlab.com>2019-09-01 13:39:49 +0000
commit754e11b7188865cf16aae0a9f27d9b16f208f601 (patch)
tree1ffe49fface8df34c1614df002eebcd68aa8dc7e
parent1427c98017e8028b0563b67b99033d1c4ce3641e (diff)
parent667b5254aa80f45c0e870064a6fb79c80b7dbec6 (diff)
downloadgitlab-shell-754e11b7188865cf16aae0a9f27d9b16f208f601.tar.gz
Merge branch 'release-9-4-2' into 'master'v9.4.2
Release v9.4.2 See merge request gitlab-org/gitlab-shell!331
-rw-r--r--CHANGELOG3
-rw-r--r--VERSION2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 8d0fc1d..339d8b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v9.4.2
+ - Repurpose bin/authorized_keys script !330
+
v9.4.1
- Fix bug preventing gitlab-development-kit from updating !327
diff --git a/VERSION b/VERSION
index ccfb75e..3c40359 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-9.4.1
+9.4.2