diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-03 09:30:20 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-03 10:24:00 -0700 |
| commit | 3fdcb7d8a13551d73dcd808c9e83bd524a593bc3 (patch) | |
| tree | 388870e52dc19e21e60b20acba015dad14f17eba | |
| parent | 62c464651d2df6f4002af4e4967d11be9aec8d92 (diff) | |
| download | gitlab-ce-sh-gitaly-update-for-11-10.tar.gz | |
Use 3-way merge for squashing commitssh-gitaly-update-for-11-10
This upgrades Gitaly to 1.34.2 for 11-10-stable.
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-gitaly-update-for-11-10.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index a95a46d9fa9..00e952d041c 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -1.34.1 +1.34.2 diff --git a/changelogs/unreleased/sh-gitaly-update-for-11-10.yml b/changelogs/unreleased/sh-gitaly-update-for-11-10.yml new file mode 100644 index 00000000000..5a61d5db43e --- /dev/null +++ b/changelogs/unreleased/sh-gitaly-update-for-11-10.yml @@ -0,0 +1,5 @@ +--- +title: Use 3-way merge for squashing commits +merge_request: 28078 +author: +type: fixed |