summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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