summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2022-05-12 06:15:22 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2022-05-12 06:15:22 +0000
commit2dc8da41846f7293188ad06128c323d057c6a3e2 (patch)
tree32d7709e54990d2e46e239f2281cf7b589fd7cf6
parent0d073a84997c5f3c339517ed9743c40a1ccd8eff (diff)
parent3a2f10f7370fbdcb1b254d6505e33789c6827ede (diff)
downloadgitlab-shell-2dc8da41846f7293188ad06128c323d057c6a3e2.tar.gz
Merge branch 'id-release-14-2-0' into 'main'v14.2.0
Release 14.2.0 See merge request gitlab-org/gitlab-shell!623
-rw-r--r--CHANGELOG5
-rw-r--r--VERSION2
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index eb971a7..f60ba3e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+v14.2.0
+
+- Implement ClientKeepAlive option !622
+- build: bump go-proxyproto to 0.6.2 !610
+
v14.1.1
- Log the error that happens on sconn.Wait() !613
diff --git a/VERSION b/VERSION
index 26f2bbc..07ea9fa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.1
+14.2.0