From 0f34535009dfae68ed68d5ee8a27e0f9b666c9ac Mon Sep 17 00:00:00 2001
From: Bartlomiej Plotka <bwplotka@gmail.com>
Date: Tue, 9 Jun 2020 05:47:53 +0100
Subject: [PATCH] Cut 2.18.2 + cherry pick of query bugfix.

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aec464e7fc..623fa8f73f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.18.2 / 2020-06-09
+
+* [BUGFIX] TSDB: Fix incorrect query results when using Prometheus with remote reads configured #7361
+
 ## 2.18.1 / 2020-05-07
 
 * [BUGFIX] TSDB: Fixed snapshot API. #7217
diff --git a/VERSION b/VERSION
index a36e9b0906..61dc3342f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.18.1
+2.18.2