Merge branch 'release-1.5'

.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 language: go
 
 go:
-- 1.7.3
+- 1.7.4
 
 go_import_path: github.com/prometheus/prometheus
 

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.

VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2