From 2d573e2e2b7127882ab2c221fd554371e0274c76 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Wed, 24 Jul 2019 13:38:33 +0100
Subject: [PATCH] 1.2.0rc2

---
 CHANGES.md              | 9 +++++++++
 changelog.d/5734.bugfix | 1 -
 synapse/__init__.py     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/5734.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index bb6bcb75e..be3dc3713 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.2.0rc2 (2019-07-24)
+=============================
+
+Bugfixes
+--------
+
+- Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734))
+
+
 Synapse 1.2.0rc1 (2019-07-22)
 =============================
 
diff --git a/changelog.d/5734.bugfix b/changelog.d/5734.bugfix
deleted file mode 100644
index 33aea5a94..000000000
--- a/changelog.d/5734.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index f26e49da3..ca14545e4 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -35,4 +35,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.2.0rc1"
+__version__ = "1.2.0rc2"