From 6b0608cb8573fe8450332aa3a675848fa1adfd89 Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Mon, 24 Jul 2017 11:46:33 +0200 Subject: [PATCH 1/2] Fix bug with truncation of file containing metrics bump prometheus gem version --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b0b437ae342..b295cf8cdf4 100644 --- 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) From 87308484fa60bfdbd5a03674cd0c619a225aa95c Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Mon, 24 Jul 2017 13:22:59 +0200 Subject: [PATCH 2/2] [ci skip] Add Changelog entry metrics files handling --- changelogs/unreleased/pawel-fix-metrics-files-handling.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelogs/unreleased/pawel-fix-metrics-files-handling.yml 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: