summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2022-05-23 08:49:29 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2022-05-23 08:49:29 +0000
commit4d2459f3b5af7de6684fdf1ea012b386ed17f424 (patch)
treefbd2ab3857420218a229af4ef64dd56ac32eda98
parent3909c673ef1b1bc59cae549682615947a1679ad5 (diff)
parent5afa7e4412dbe5187f41708b71185c044b3279ee (diff)
downloadgitlab-shell-4d2459f3b5af7de6684fdf1ea012b386ed17f424.tar.gz
Merge branch 'id-release-14-6-1' into 'main'v14.6.1
Release v14.6.1 See merge request gitlab-org/gitlab-shell!645
-rw-r--r--CHANGELOG4
-rw-r--r--VERSION2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e23e897..def1b52 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+v14.6.1
+
+- Return support for diffie-hellman-group14-sha1 !644
+
v14.6.0
- Exclude Gitaly unavailable error from error rate !641
diff --git a/VERSION b/VERSION
index df249f4..e4ce12f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.0
+14.6.1