summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-08-17 14:01:14 +0000
committerJose Vargas <jvargas@gitlab.com>2018-08-17 13:03:08 -0500
commit5f956ee9705bc4be9c200e2d7ebfa3e6a28d8e0e (patch)
tree1165fed20034d00585097aa6a0b2f968d13c2a60
parentd2eff1fac21ace733460a4c32373ee56f95c3235 (diff)
downloadgitlab-ce-5f956ee9705bc4be9c200e2d7ebfa3e6a28d8e0e.tar.gz
Merge branch 'sh-bump-gitaly-for-11-2' into 'master'
Bump Gitaly to 0.117.1 for Rouge update See merge request gitlab-org/gitlab-ce!21277
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/sh-bump-gitaly-for-11-2.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index a38b3bd31b1..90bdef2ea8c 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-0.117.0
+0.117.1
diff --git a/changelogs/unreleased/sh-bump-gitaly-for-11-2.yml b/changelogs/unreleased/sh-bump-gitaly-for-11-2.yml
new file mode 100644
index 00000000000..0e748c3a346
--- /dev/null
+++ b/changelogs/unreleased/sh-bump-gitaly-for-11-2.yml
@@ -0,0 +1,5 @@
+---
+title: Bump Gitaly to 0.117.1 for Rouge update
+merge_request: 21277
+author:
+type: security