diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-09-29 16:24:50 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-09-29 16:24:50 +0000 |
| commit | 1ca2173b65f6f949116fc6daf8a51f203ffb3d8f (patch) | |
| tree | 73824beec320204b6aff058376d6945e7b20a0f6 | |
| parent | 0816838b8b9da0108b1f37c84393c5a1035f9b66 (diff) | |
| parent | 0b5d6298f363a50d21e81758f6c1a75b924a0995 (diff) | |
| download | gitlab-ce-1ca2173b65f6f949116fc6daf8a51f203ffb3d8f.tar.gz | |
Merge branch 'update-shell' into '8-12-stable'
Bump Gitlab Shell to support low IO priority for storage moves
## What does this MR do?
Bump Gitlab Shell to support low IO priority for storage moves
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
We need this shell enhancement to continue to move projects in production
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-com/infrastructure/issues/443
See merge request !6525
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | GITLAB_SHELL_VERSION | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1b35bc846d9..f742085c99e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ v 8.12.2 - Only update issuable labels if they have been changed - Fix bug where 'Search results' repeated many times when a search in the emoji search form is cleared (Xavier Bick) (@zeiv) - Fix resolve discussion buttons endpoint path + - Update Gitlab Shell to support low IO priority for storage moves v 8.12.1 - Fix a memory leak in HTML::Pipeline::SanitizationFilter::WHITELIST diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index 40c341bdcdb..9575d51bad2 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -3.6.0 +3.6.1 |