Merge pull request prometheus#2415 from prometheus/beorn7/release

Cut v1.5.2
rongfengliang · Feb 10, 2017 · bd1182d · bd1182d
2 parents d3297e0 + 6c17d30
commit bd1182d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -1 +1 @@
-1.5.1
+1.5.2