From 82c989a16eab51018376530942fe58869cd792d3 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Sat, 3 Feb 2018 15:23:18 +0100
Subject: [PATCH 1/2] bump version to v2.2.0-rc.0

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 7ec1d6db4..f7757a264 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0
+2.2.0-rc.0

From 7e820ce92d28a4e6411f0c3d9196c80303d72a2d Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Sat, 3 Feb 2018 15:23:36 +0100
Subject: [PATCH 2/2] Add v2.2.0-rc.0 changelog entry

---
 CHANGELOG.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08dcf8417..014fd48ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,21 @@
-## 2.1.0 / 2018-1-19
+## 2.2.0-rc.0 / 2018-02-13
+
+* [CHANGE] Rename file SD mtime metric.
+* [ENHANCEMENT] Federation performance improvement.
+* [ENHANCEMENT] Read bearer token file on every scrape.
+* [ENHANCEMENT] Improve typeahead on `/graph` page.
+* [ENHANCEMENT] Change rule file formatting.
+* [ENHANCEMENT] Set consul server default to `localhost:8500`.
+* [BUGFIX] Drop metric name for bool modifier.
+* [BUGFIX] Fix races in discovery.
+* [BUGFIX] Fix Kubernetes endpoints SD for empty subsets.
+* [BUGFIX] Throttle updates from SD providers, which caused increased CPU usage and allocations.
+* [BUGFIX] Fix TSDB block reload issue.
+* [BUGFIX] Fix PromQL printing of empty `without()`.
+* [BUGFIX] Don't reset FiredAt for inactive alerts.
+* [BUGFIX] Fix erroneous file version changes and repair existing data.
+
+## 2.1.0 / 2018-01-19
 
 * [FEATURE] New Service Discovery UI showing labels before and after relabelling.
 * [FEATURE] New Admin APIs added to v1 to delete, snapshot and remove tombstones.