From bfe3dafcf0e4ce63c3efb2f8e9d53fe999592c64 Mon Sep 17 00:00:00 2001
From: Bartlomiej Plotka <bwplotka@gmail.com>
Date: Mon, 6 Jan 2020 14:36:22 +0000
Subject: [PATCH] Cut release 2.15.2

Cherry-picked 2 commits.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
---
 CHANGELOG.md | 7 ++++++-
 VERSION      | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33a611ea3..05320f7cb 100644
--- 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
index 3b1fc7950..07d875c2d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.15.1
+2.15.2