summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-08-17 14:01:14 +0000
committerDouwe Maan <douwe@gitlab.com>2018-08-17 14:01:14 +0000
commit5309988b2be6ab79a4bbcc2d90442633199246d6 (patch)
tree3f7f33ba1741b0b9ecdf5998a4c8203b3a776a52
parent74eec89ebe0b118f8aba6051f53d5dbe5e68c2d1 (diff)
parent61752ebfa7e1df74f2671e498bceeace88eed4bb (diff)
downloadgitlab-ce-5309988b2be6ab79a4bbcc2d90442633199246d6.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