From 40de53423856eee775fc3777b101ac1e3581bcee Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Thu, 11 Feb 2021 11:22:29 -0500
Subject: [PATCH] 1.27.0rc2

---
 CHANGES.md               | 22 ++++++++++++++++++++++
 changelog.d/9297.feature |  1 -
 changelog.d/9302.bugfix  |  1 -
 changelog.d/9310.doc     |  1 -
 changelog.d/9313.bugfix  |  1 -
 synapse/__init__.py      |  2 +-
 6 files changed, 23 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/9297.feature
 delete mode 100644 changelog.d/9302.bugfix
 delete mode 100644 changelog.d/9310.doc
 delete mode 100644 changelog.d/9313.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 16c11ff0c..3de781d4e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,25 @@
+Synapse 1.27.0rc2 (2021-02-11)
+==============================
+
+Features
+--------
+
+- Further improvements to the user experience of registration via single sign-on. ([\#9297](https://github.com/matrix-org/synapse/issues/9297))
+
+
+Bugfixes
+--------
+
+- Fix new ratelimiting for invites to respect the `ratelimit` flag on application services. Introduced in v1.27.0rc1. ([\#9302](https://github.com/matrix-org/synapse/issues/9302))
+- Do not automatically calculate `public_baseurl` since it can be wrong in some situations. ([\#9313](https://github.com/matrix-org/synapse/issues/9313))
+
+
+Improved Documentation
+----------------------
+
+- Clarify the sample configuration for changes made to the template loading code. ([\#9310](https://github.com/matrix-org/synapse/issues/9310))
+
+
 Synapse 1.27.0rc1 (2021-02-02)
 ==============================
 
diff --git a/changelog.d/9297.feature b/changelog.d/9297.feature
deleted file mode 100644
index a2d0b27da..000000000
--- a/changelog.d/9297.feature
+++ /dev/null
@@ -1 +0,0 @@
-Further improvements to the user experience of registration via single sign-on.
diff --git a/changelog.d/9302.bugfix b/changelog.d/9302.bugfix
deleted file mode 100644
index c1cdea52a..000000000
--- a/changelog.d/9302.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix new ratelimiting for invites to respect the `ratelimit` flag on application services. Introduced in v1.27.0rc1.
diff --git a/changelog.d/9310.doc b/changelog.d/9310.doc
deleted file mode 100644
index f61705b73..000000000
--- a/changelog.d/9310.doc
+++ /dev/null
@@ -1 +0,0 @@
-Clarify the sample configuration for changes made to the template loading code.
diff --git a/changelog.d/9313.bugfix b/changelog.d/9313.bugfix
deleted file mode 100644
index f578fd13d..000000000
--- a/changelog.d/9313.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Do not automatically calculate `public_baseurl` since it can be wrong in some situations.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 06b3820be..283d6ffef 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.27.0rc1"
+__version__ = "1.27.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