Cut release 2.15.2

Cherry-picked 2 commits. Signed-off-by: Bartlomiej Plotka <[email protected]>
liguozhong · Jan 6, 2020 · 801eaa2 · 801eaa2
1 parent 000e306
commit 801eaa2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
+## 2.15.2 / 2020-01-06
+
+* [BUGFIX] TSDB: Fixed support for TSDB blocks built with Prometheus before 2.1.0. #6564
+* [BUGFIX] TSDB: Fixed block compaction issues on Windows. #6547
+
 ## 2.15.1 / 2019-12-25
 
-* [BUGFIX] Fixed race on concurrent queries against same data. #6512
+* [BUGFIX] TSDB: Fixed race on concurrent queries against same data. #6512
 
 ## 2.15.0 / 2019-12-23
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.15.1
+2.15.2