From abf1d6e413e94ebde06c181c262d6dab2d2aad3e Mon Sep 17 00:00:00 2001 From: beorn7 Date: Fri, 10 Feb 2017 12:44:57 +0100 Subject: [PATCH 1/3] storage: Fix typo in doc comment --- storage/local/persistence.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/local/persistence.go b/storage/local/persistence.go index f3d840f76a..efb65c4cb5 100644 --- a/storage/local/persistence.go +++ b/storage/local/persistence.go @@ -962,7 +962,7 @@ func (p *persistence) dropAndPersistChunks( } // We've found the first chunk that should be kept. - // First check if the shrink ratio is good enough to perform the the + // First check if the shrink ratio is good enough to perform the // actual drop or leave it for next time if it is not worth the effort. fi, err := f.Stat() if err != nil { From d3297e06863728de1507bc18fbcd73b6eec84e7a Mon Sep 17 00:00:00 2001 From: beorn7 Date: Fri, 10 Feb 2017 13:05:32 +0100 Subject: [PATCH 2/3] build: Use Go1.7.4 in Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3612d19dd7..78c382486f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: false language: go go: -- 1.7.3 +- 1.7.4 go_import_path: github.com/prometheus/prometheus From 6c17d3068896a32e6db0c95ff8292c098ed97403 Mon Sep 17 00:00:00 2001 From: beorn7 Date: Fri, 10 Feb 2017 13:16:17 +0100 Subject: [PATCH 3/3] Cut v1.5.2 --- CHANGELOG.md | 8 ++++++++ VERSION | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8055b4903..9149f3a818 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 1.5.2 / 2017-02-10 + +* [BUGFIX] Fix series corruption in a special case of series maintenance where + the minimum series-file-shrink-ratio kicks in. +* [BUGFIX] Fix two panic conditions both related to processing a series + scheduled to be quarantined. +* [ENHANCEMENT] Binaries built with Go1.7.5. + ## 1.5.1 / 2017-02-07 * [BUGFIX] Don't lose fully persisted memory series during checkpointing. diff --git a/VERSION b/VERSION index 26ca594609..4cda8f19ed 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.1 +1.5.2