diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-10-19 13:43:22 +0000 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-10-19 13:58:59 +0000 |
| commit | a91eb65570127039af177a785bf023eb3ad6d0be (patch) | |
| tree | 930e4c1052940332228ee03952fe5fadc6672b69 | |
| parent | b3cc7385caf12d5d84b44b52529c13e60b5b030e (diff) | |
| download | gitlab-ce-10-1-stable-prepare-rc4.tar.gz | |
Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' into 'master'10-1-stable-prepare-rc4
Update Prometheus gem to fix problems with other Processes overwriting current metrics file
Closes #36714
See merge request gitlab-org/gitlab-ce!14827
(cherry picked from commit f73efb793233f69a0402ba529410bf52c6105c2c)
f9a4f184 Update Prometheus gem to fix problems with other files overwriting current file
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -281,7 +281,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~>0.7.0.beta14' + gem 'prometheus-client-mmap', '~>0.7.0.beta17' gem 'raindrops', '~> 0.18' end diff --git a/Gemfile.lock b/Gemfile.lock index 6040596dda5..8dc206c46a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -620,7 +620,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.7.0.beta14) + prometheus-client-mmap (0.7.0.beta17) mmap2 (~> 2.2, >= 2.2.7) pry (0.10.4) coderay (~> 1.1.0) @@ -1103,7 +1103,7 @@ DEPENDENCIES pg (~> 0.18.2) poltergeist (~> 1.9.0) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.7.0.beta14) + prometheus-client-mmap (~> 0.7.0.beta17) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |