summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2022-04-19 11:55:39 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2022-04-19 11:55:39 +0000
commit47a45afc661cd86c878e113602a78c3e74739f78 (patch)
tree1200410e87f3c8dc6002425708501deb70144e5a
parentcf4879415fb3c5e7e5c025e721417a10bc795752 (diff)
parent88074dd700d1b2ba577af7ae1f5e548e744719f1 (diff)
downloadgitlab-shell-47a45afc661cd86c878e113602a78c3e74739f78.tar.gz
Merge branch 'id-release-13-25-1' into 'main'v13.25.1
Release 13.25.1 See merge request gitlab-org/gitlab-shell!598
-rw-r--r--CHANGELOG6
-rw-r--r--VERSION2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f5d16a1..0e1cac6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+v13.25.1
+
+- Upgrade golang to 1.17.8 !591
+- Add additional metrics to gitlab-sshd !593
+- Add support for FIPS encryption !597
+
v13.25.0
- Fix connections duration metrics !588
diff --git a/VERSION b/VERSION
index c80e5e5..5dd2f9e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.25.0
+13.25.1