From b4109499b452887894d514285bdac20869809d0b Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Wed, 27 May 2020 17:22:28 +0200
Subject: [PATCH] 1.14.0rc2

---
 CHANGES.md              | 17 +++++++++++++++++
 changelog.d/7578.bugfix |  1 -
 changelog.d/7579.bugfix |  1 -
 changelog.d/7580.bugfix |  1 -
 changelog.d/7581.doc    |  1 -
 synapse/__init__.py     |  2 +-
 6 files changed, 18 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/7578.bugfix
 delete mode 100644 changelog.d/7579.bugfix
 delete mode 100644 changelog.d/7580.bugfix
 delete mode 100644 changelog.d/7581.doc

diff --git a/CHANGES.md b/CHANGES.md
index 914690b7b..ac5976871 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,20 @@
+Synapse 1.14.0rc2 (2020-05-27)
+==============================
+
+Bugfixes
+--------
+
+- Fix cache config to not apply cache factor to event cache. Regression in v1.14.0rc1. ([\#7578](https://github.com/matrix-org/synapse/issues/7578))
+- Fix bug where `ReplicationStreamer` was not always started when replication was enabled. Bug introduced in v1.14.0rc1. ([\#7579](https://github.com/matrix-org/synapse/issues/7579))
+- Fix specifying individual cache factors for caches with special characters in their name. Regression in v1.14.0rc1. ([\#7580](https://github.com/matrix-org/synapse/issues/7580))
+
+
+Improved Documentation
+----------------------
+
+- Fix OIDC client_auth_method commented out value in sample config. ([\#7581](https://github.com/matrix-org/synapse/issues/7581))
+
+
 Synapse 1.14.0rc1 (2020-05-26)
 ==============================
 
diff --git a/changelog.d/7578.bugfix b/changelog.d/7578.bugfix
deleted file mode 100644
index cd2930736..000000000
--- a/changelog.d/7578.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix cache config to not apply cache factor to event cache. Regression in v1.14.0rc1.
diff --git a/changelog.d/7579.bugfix b/changelog.d/7579.bugfix
deleted file mode 100644
index 54542b602..000000000
--- a/changelog.d/7579.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where `ReplicationStreamer` was not always started when replication was enabled. Bug introduced in v1.14.0rc1.
diff --git a/changelog.d/7580.bugfix b/changelog.d/7580.bugfix
deleted file mode 100644
index b255dc2a1..000000000
--- a/changelog.d/7580.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix specifying individual cache factors for caches with special characters in their name. Regression in v1.14.0rc1.
diff --git a/changelog.d/7581.doc b/changelog.d/7581.doc
deleted file mode 100644
index 88beeb7bd..000000000
--- a/changelog.d/7581.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix OIDC client_auth_method commented out value in sample config.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 6327147d8..5e957985d 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.14.0rc1"
+__version__ = "1.14.0rc2"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when