diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-10-19 16:43:22 +0300 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-11-01 16:23:38 +0300 |
| commit | 5b68b53bb2f1b915424bd57f7d6b84977d58c291 (patch) | |
| tree | 718be65b396509fde00474775e19b84c6d169bd9 | |
| parent | 465feb1bd6efeedc827055bb2e1447c73fb5a576 (diff) | |
Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' into 'master'
Update Prometheus gem to fix problems with other Processes overwriting current metrics file
Closes #36714
See merge request gitlab-org/gitlab-ce!14827
| -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 e70985bb3c9..713731986b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -624,7 +624,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) @@ -1100,7 +1100,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) |