summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2023-03-06 16:13:30 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2023-03-06 16:13:30 +0000
commitf76503aeb40e6e4702d9697a29ff38fad4a0352f (patch)
tree2b2ece15e9f265d43b91bbd2148988831228187a
parent23409f0eb98b0e8d3b0fcb57a31d75ddd6dc8262 (diff)
parent1132e554f7227e8b69d245aae2a0dfaef11ef796 (diff)
downloadgitlab-shell-f76503aeb40e6e4702d9697a29ff38fad4a0352f.tar.gz
Merge branch 'id-release-14-18-0' into 'main'v14.18.0
Release v14.18.0 See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/722 Merged-by: Igor Drozdov <idrozdov@gitlab.com> Approved-by: Igor Drozdov <idrozdov@gitlab.com>
-rw-r--r--CHANGELOG7
-rw-r--r--VERSION2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index be81385..7ecce94 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+v14.18.0
+
+- Perform HTTP request to primary on Geo push !716
+- sshd: exclude gssapi when building without cgo !720
+- Add DNS discovery support for Gitaly/Praefect !717
+- Add bin/gitlab-sshd as an explicit Makefile target !714
+
v14.17.0
- Bump golang to 1.18.9 !712
diff --git a/VERSION b/VERSION
index 62df50f..c2324e8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.17.0
+14.18.0