From 7000a215e6387f54ce2f0aa3e324cb3ad021d69f Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 28 Jul 2020 11:22:32 +0100
Subject: [PATCH] 1.18.0rc2
---
CHANGES.md | 16 ++++++++++++++++
changelog.d/7876.bugfix | 1 -
changelog.d/7876.misc | 1 -
changelog.d/7967.bugfix | 1 -
synapse/__init__.py | 2 +-
5 files changed, 17 insertions(+), 4 deletions(-)
delete mode 100644 changelog.d/7876.bugfix
delete mode 100644 changelog.d/7876.misc
delete mode 100644 changelog.d/7967.bugfix
diff --git a/CHANGES.md b/CHANGES.md
index 74b8e1df87..2ecbd3fd00 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,19 @@
+Synapse 1.18.0rc2 (2020-07-28)
+==============================
+
+Bugfixes
+--------
+
+- Fix an `AssertionError` exception introduced in v1.18.0rc1. ([\#7876](https://github.com/matrix-org/synapse/issues/7876))
+- Fix experimental support for moving typing off master when worker is restarted, which is broken in v1.18.0rc1. ([\#7967](https://github.com/matrix-org/synapse/issues/7967))
+
+
+Internal Changes
+----------------
+
+- Further optimise queueing of inbound replication commands. ([\#7876](https://github.com/matrix-org/synapse/issues/7876))
+
+
Synapse 1.18.0rc1 (2020-07-27)
==============================
diff --git a/changelog.d/7876.bugfix b/changelog.d/7876.bugfix
deleted file mode 100644
index 4ba2fadd58..0000000000
--- a/changelog.d/7876.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix an `AssertionError` exception introduced in v1.18.0rc1.
diff --git a/changelog.d/7876.misc b/changelog.d/7876.misc
deleted file mode 100644
index 5c78a158cd..0000000000
--- a/changelog.d/7876.misc
+++ /dev/null
@@ -1 +0,0 @@
-Further optimise queueing of inbound replication commands.
diff --git a/changelog.d/7967.bugfix b/changelog.d/7967.bugfix
deleted file mode 100644
index 105ea1c7e0..0000000000
--- a/changelog.d/7967.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix experimental support for moving typing off master when worker is restarted, which is broken in v1.18.0-rc1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 900513499d..83ce2ae6f4 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
except ImportError:
pass
-__version__ = "1.18.0rc1"
+__version__ = "1.18.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
--
GitLab