summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2022-04-26 03:34:42 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2022-04-26 03:34:42 +0000
commit01d5f4b095b24187e9bae885be09ed11fbf75e7f (patch)
tree7a2c94a2a763ec47eb79ffbaca3a69e2509ed194
parentb3b2f77eb2deed2bdd16eb6ec7dce6c8c4dcf241 (diff)
parentd9b8e41aa915eaec7173b65c2b224ff3a632c0f0 (diff)
downloadgitlab-shell-01d5f4b095b24187e9bae885be09ed11fbf75e7f.tar.gz
Merge branch 'id-release-13-25-2' into 'main'v13.25.2
Release v13.25.2 See merge request gitlab-org/gitlab-shell!606
-rw-r--r--CHANGELOG5
-rw-r--r--VERSION2
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0e1cac6..8cb84b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+v13.25.2
+
+- Revert "Abort long-running unauthenticated SSH connections" !605
+- Bump Go to 1.17.9 for asdf users !600
+
v13.25.1
- Upgrade golang to 1.17.8 !591
diff --git a/VERSION b/VERSION
index 5dd2f9e..fe160c8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.25.1
+13.25.2