summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2022-05-11 05:03:56 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2022-05-11 05:03:56 +0000
commit42cf058b7292527b250d48167b2db5ec85736f37 (patch)
treea2ca1bd7edad1c950e4f46a7b30472c1dbe954f4
parentba847e4218f2e7600fa4099a5f2817c9b5f28e2a (diff)
parent05c2002d07747d84f75847fda74f1f218898ecc1 (diff)
downloadgitlab-shell-42cf058b7292527b250d48167b2db5ec85736f37.tar.gz
Merge branch 'id-release-14-1-0' into 'main'v14.1.1
Release 14.1.1 See merge request gitlab-org/gitlab-shell!621
-rw-r--r--CHANGELOG4
-rw-r--r--VERSION2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7e9dc0f..eb971a7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+v14.1.1
+
+- Log the error that happens on sconn.Wait() !613
+
v14.1.0
- Make PROXY policy configurable !619
diff --git a/VERSION b/VERSION
index 7b3b6e0..26f2bbc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.0
+14.1.1