summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-12-12 10:34:25 +0000
committerSean McGivern <sean@gitlab.com>2018-12-12 10:34:25 +0000
commit3a1edd97c4e471c0a373d7a276f97e75e0e1aa2a (patch)
treeffa784f297600e91de76291018de45cce100dce8
parent840c9cc53ca39f9b5b4fd813ac447524b7118732 (diff)
parent4a0e13108d79d9dacc5eccdd86cd273a3529872d (diff)
downloadgitlab-ce-3a1edd97c4e471c0a373d7a276f97e75e0e1aa2a.tar.gz
Merge branch 'upgrade-gitaly-to-v1.7.1' into '11-6-stable'
Upgrade Gitaly to v1.7.1 for correlation-id logging See merge request gitlab-org/gitlab-ce!23732
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/upgrade-gitaly-to-v1-7-1.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index bd8bf882d06..943f9cbc4ec 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.7.0
+1.7.1
diff --git a/changelogs/unreleased/upgrade-gitaly-to-v1-7-1.yml b/changelogs/unreleased/upgrade-gitaly-to-v1-7-1.yml
new file mode 100644
index 00000000000..8a4e9fe2302
--- /dev/null
+++ b/changelogs/unreleased/upgrade-gitaly-to-v1-7-1.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade Gitaly to v1.7.1 for correlation-id logging
+merge_request: 23732
+author:
+type: other