From ae041f97cfc6f43494bed65ec4ea4e3a0cf2ac69 Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Thu, 26 Mar 2020 17:14:12 +0100
Subject: [PATCH] Release 2.17.1 (#7055)

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
---
 CHANGELOG.md | 4 ++++
 VERSION      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a1d9315ee..51fb9048eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.17.1 / 2020-03-26
+
+* [BUGFIX] TSDB: Fix query performance regression that increased memory and CPU usage #7051
+
 ## 2.17.0 / 2020-03-24
 
 This release implements isolation in TSDB. API queries and recording rules are
diff --git a/VERSION b/VERSION
index d76bd2ba3e..3f8eb714d0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.17.0
+2.17.1