diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-24 12:11:12 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-07-24 11:21:19 -0500 |
| commit | 0225d0b03ed1f472f9570d80b8cc07e458591d86 (patch) | |
| tree | 748f3d3fd5a63385751eb032f1a80794904b6632 | |
| parent | 9bbe2acf7fb75d19cc3db4e82e82eba47c65202e (diff) | |
| download | gitlab-ce-0225d0b03ed1f472f9570d80b8cc07e458591d86.tar.gz | |
Merge branch 'pawel/bump_prometheus_client_library' into 'master'
Fix bug causing truncation of Metrics files
See merge request !13035
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/pawel-fix-metrics-files-handling.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index cc160b45e6a..f6251e988df 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -596,7 +596,7 @@ GEM premailer-rails (1.9.7) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) - prometheus-client-mmap (0.7.0.beta9) + prometheus-client-mmap (0.7.0.beta10) mmap2 (~> 2.2, >= 2.2.7) pry (0.10.4) coderay (~> 1.1.0) diff --git a/changelogs/unreleased/pawel-fix-metrics-files-handling.yml b/changelogs/unreleased/pawel-fix-metrics-files-handling.yml new file mode 100644 index 00000000000..cfdb4246af9 --- /dev/null +++ b/changelogs/unreleased/pawel-fix-metrics-files-handling.yml @@ -0,0 +1,4 @@ +--- +title: Fix bug causing metrics files to be truncated +merge_request: 35420 +author: |