diff options
author | Robert Speicher <robert@gitlab.com> | 2017-07-27 15:47:01 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-07-27 15:47:01 +0000 |
commit | 98619a49c8e239a9e7c39451d72de4855a3eef9e (patch) | |
tree | 2d02158f7134daab3b1461b79f692a3b77a6c26d /Gemfile | |
parent | d5f91df9a5e5adf58f1729cda728babcd10f7099 (diff) | |
parent | 3265ac4f39e6760340722c524113ac1691fdcf8d (diff) | |
download | gitlab-ce-98619a49c8e239a9e7c39451d72de4855a3eef9e.tar.gz |
Merge branch 'pawel/prometheus_client_pid_reuse_error' into 'master'
Fix prometheus client pid reuse bug
See merge request !13130
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -289,7 +289,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~>0.7.0.beta9' + gem 'prometheus-client-mmap', '~>0.7.0.beta11' gem 'raindrops', '~> 0.18' end |