diff options
author | Marin Jankovski <marin@gitlab.com> | 2016-08-20 09:33:09 +0000 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-20 13:06:37 -0500 |
commit | 0f2ffb7484ebcdb4226497c7d40917aa75a60f17 (patch) | |
tree | 662931eaba46cf915ddfa925a04131ae9fd9d546 | |
parent | 707bb9dcad5daf2b8f1dfdfd62fc2c4280497a4b (diff) | |
download | gitlab-ce-0f2ffb7484ebcdb4226497c7d40917aa75a60f17.tar.gz |
Merge branch 'gitlab_shell_version_update' into 'master'
Update gitlab-shell to v3.4.0
Part of Redis Sentinel support: gitlab-org/gitlab-shell#29
See merge request !5920
-rw-r--r-- | GITLAB_SHELL_VERSION | 2 | ||||
-rw-r--r-- | doc/update/8.10-to-8.11.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index 619b5376684..18091983f59 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -3.3.3 +3.4.0 diff --git a/doc/update/8.10-to-8.11.md b/doc/update/8.10-to-8.11.md index 84c624cbcb7..253fff50bdd 100644 --- a/doc/update/8.10-to-8.11.md +++ b/doc/update/8.10-to-8.11.md @@ -46,7 +46,7 @@ sudo -u git -H git checkout 8-11-stable-ee ```bash cd /home/git/gitlab-shell sudo -u git -H git fetch --all --tags -sudo -u git -H git checkout v3.3.3 +sudo -u git -H git checkout v3.4.0 ``` ### 5. Update gitlab-workhorse |