diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-03 18:18:59 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-03 18:18:59 +0000 |
| commit | 4b0bd4f828cbd957ab0d6b828addd294f1397252 (patch) | |
| tree | 794d2cb11eab1650e344ef9daa8d571b5fe8e375 | |
| parent | 95336861e97eb72fba8c3034deb2b9b61c9ec961 (diff) | |
| parent | 26525064a8623851f1047bbf0f00ee9061cabe9e (diff) | |
| download | gitlab-ce-4b0bd4f828cbd957ab0d6b828addd294f1397252.tar.gz | |
Merge branch 'downgrade-redis-3-2-2' into 'master'
Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq
This affects GitLab 8.8 and 8.9. See:
* https://github.com/mperham/sidekiq/blob/master/Changes.md#413
* https://gitlab.com/gitlab-org/gitlab-ce/issues/19441
See merge request !5056
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2f29a64df1b..4f9654dfbef 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,6 +36,7 @@ v 8.9.5 (unreleased) - Improve the request / withdraw access button. !4860 - Fix assigning shared runners as admins. !4961 - Show "locked" label for locked runners on runners admin. !4961 + - Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq - Fixes issues importing events in Import/Export. Import/Export version bumped to 0.1.1 - Fix import button disabled when import process fail due to the namespace already been taken. - Security: Update RedCloth to 4.3.2 (Takuya Noguchi) diff --git a/Gemfile.lock b/Gemfile.lock index 34138decc13..238af158838 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -554,7 +554,7 @@ GEM recaptcha (3.0.0) json redcarpet (3.3.3) - redis (3.3.0) + redis (3.2.2) redis-actionpack (4.0.1) actionpack (~> 4) redis-rack (~> 1.5.0) |