summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-04-18 18:05:25 +0000
committerStan Hu <stanhu@gmail.com>2019-04-18 18:05:25 +0000
commit63e41ba61b3ae0fba19500d01bfe041109590d14 (patch)
tree1b5dd3ad060816464c72e3353084e9ebb488ca99
parent9cb136bd189917a541d0575d21536e5f9f4647dd (diff)
parent400d1369688f7b53baa675e119d250bfb5bfd9be (diff)
downloadgitlab-ce-63e41ba61b3ae0fba19500d01bfe041109590d14.tar.gz
Merge branch 'jc-upgrade-gitaly-1.34.0' into 'master'
Upgrade Gitaly to 1.34.0 See merge request gitlab-org/gitlab-ce!27494
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/jc-upgrade-gitaly-1-34-0.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 7aa332e4163..2b17ffd5042 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.33.0
+1.34.0
diff --git a/changelogs/unreleased/jc-upgrade-gitaly-1-34-0.yml b/changelogs/unreleased/jc-upgrade-gitaly-1-34-0.yml
new file mode 100644
index 00000000000..c1669a484aa
--- /dev/null
+++ b/changelogs/unreleased/jc-upgrade-gitaly-1-34-0.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade Gitaly to 1.34.0
+merge_request: 27494
+author:
+type: fixed