diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-03 21:18:59 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-07-06 19:50:29 +0300 |
| commit | e0733819b1c4d75e664582fc09c1b67feaa076ff (patch) | |
| tree | d21edf2f82931b064bbd744852501749613cb6a2 /Gemfile.lock | |
| parent | b7a6252497547f1187f17918f0b49bcc6e64eccb (diff) | |
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
(cherry picked from commit 4b0bd4f828cbd957ab0d6b828addd294f1397252)
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9096b7f8cfe..b9f61cb0d13 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -566,7 +566,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) |