summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-05-20 14:06:50 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-05-20 14:06:50 +0000
commit9c1470c260032c8b3d9cd6cf759fd08a610e9a1b (patch)
tree1dacd3907a8d922a5d628c3e52f8d6b49ab94e87
parent4b407a68efeb6bf61fd5100b002f3ba0b3f1bb06 (diff)
parentc06175ed4cdd602090bf43e0fadd2bc153b092c8 (diff)
downloadgitlab-ce-9c1470c260032c8b3d9cd6cf759fd08a610e9a1b.tar.gz
Merge branch 'po-gitaly-wrapper-proc' into 'master'
Update Gitaly to v1.42.1 See merge request gitlab-org/gitlab-ce!28425
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/update-gitaly-to-v1-42-1.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index a50908ca3da..e640847f99c 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.42.0
+1.42.1
diff --git a/changelogs/unreleased/update-gitaly-to-v1-42-1.yml b/changelogs/unreleased/update-gitaly-to-v1-42-1.yml
new file mode 100644
index 00000000000..ff42bdd9c0b
--- /dev/null
+++ b/changelogs/unreleased/update-gitaly-to-v1-42-1.yml
@@ -0,0 +1,5 @@
+---
+title: "Update Gitaly to v1.42.1"
+merge_request: 28425
+author:
+type: other