diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-02-07 21:25:24 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-02-07 21:25:24 +0000 |
| commit | 071b0ef35ce8e97cbdceb379e3e70a1722badca1 (patch) | |
| tree | 8bf673334874de09739d6d69f76e8c2d9223873d | |
| parent | 625eea7e076420079136ba8b913de5a277c34207 (diff) | |
| parent | f00bcb0dcf40d3520faed46075036b26523ecbc0 (diff) | |
| download | gitlab-ce-071b0ef35ce8e97cbdceb379e3e70a1722badca1.tar.gz | |
Merge branch 'prometheus-gem-update-to-version-0.9.1.pre.rc.1' into 'master'
Update prometheus gem to version 0.9.1.pre.rc.2 fixing segfaults happening on metrics deletion
See merge request gitlab-org/gitlab-ce!16964
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -294,7 +294,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.7.0.beta44' + gem 'prometheus-client-mmap', '~> 0.9.1.pre.rc.2' gem 'raindrops', '~> 0.18' end diff --git a/Gemfile.lock b/Gemfile.lock index e78c3c5f794..d9665e38f45 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -636,7 +636,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.7.0.beta44) + prometheus-client-mmap (0.9.1.pre.rc.2) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -1132,7 +1132,7 @@ DEPENDENCIES peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.7.0.beta44) + prometheus-client-mmap (~> 0.9.1.pre.rc.2) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |