Merge branch 'pawel/bump_prometheus_client_library' into 'master'

Fix bug causing truncation of Metrics files See merge request !13035

Merge branch 'pawel/bump_prometheus_client_library' into 'master'
Fix bug causing truncation of Metrics files See merge request !13035
7eaef130 · Sean McGivern · 3d3951a2 · 87308484 · 7eaef130 · 7eaef130
Commit 7eaef130 authored Jul 24, 2017 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

changelogs/unreleased/pawel-fix-metrics-files-handling.yml changelogs/unreleased/pawel-fix-metrics-files-handling.yml +4 -0

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -591,7 +591,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)

--- a/changelogs/unreleased/pawel-fix-metrics-files-handling.yml
+++ b/changelogs/unreleased/pawel-fix-metrics-files-handling.yml
+---
+title: Fix bug causing metrics files to be truncated
+merge_request: 35420
+author: