From 0225d0b03ed1f472f9570d80b8cc07e458591d86 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Mon, 24 Jul 2017 12:11:12 +0000 Subject: Merge branch 'pawel/bump_prometheus_client_library' into 'master' Fix bug causing truncation of Metrics files See merge request !13035 --- Gemfile.lock | 2 +- changelogs/unreleased/pawel-fix-metrics-files-handling.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/pawel-fix-metrics-files-handling.yml 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: -- cgit v1.2.1