From a12e96299dcd159ea09b260f1a21e7e4b86e011d Mon Sep 17 00:00:00 2001
From: Bartlomiej Plotka <bwplotka@gmail.com>
Date: Tue, 5 May 2020 15:22:02 +0100
Subject: [PATCH] Cut 2.18.0 release. (#7201)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac65e6b57..dfd1ad13c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 2.18.0-rc.1 / 2020-04-30
+## 2.18.0 / 2020-05-05
 
 * [CHANGE] Federation: Only use local TSDB for federation (ignore remote read). #7077
 * [CHANGE] Rules: `rule_evaluations_total` and `rule_evaluation_failures_total` have a `rule_group` label now. #7094
diff --git a/VERSION b/VERSION
index 903744017..cf8690732 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.18.0-rc.1
+2.18.0