kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'prometheus-gem-update-to-version-0.9.1.pre.rc.1' into 'master'

Browse source 
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
This commit is contained in:
Stan Hu 2018-02-07 21:25:24 +00:00
commit 071b0ef35c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -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

4
Gemfile.lock
View file

@ -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)