Merge branch 'id-release-14-2-0' into 'main'

Igor Drozdov · Igor Drozdov · commit 2dc8da41846f · 2022-05-12T06:15:22.000Z
Release 14.2.0

See merge request gitlab-org/gitlab-shell!623
diff --git 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
@@ -1 +1 @@
-14.1.1
+14.2.0
