From c9f7c683aefe53dd33db69848302f3ff6e77dcfb Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 10 Jul 2020 12:11:12 +0100
Subject: [PATCH] 1.16.1
---
CHANGES.md | 19 +++++++++++++++++++
changelog.d/7816.bugfix | 1 -
debian/changelog | 6 ++++++
synapse/__init__.py | 2 +-
4 files changed, 26 insertions(+), 2 deletions(-)
delete mode 100644 changelog.d/7816.bugfix
diff --git a/CHANGES.md b/CHANGES.md
index 3a0fe606f8..a937b8cc31 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,22 @@
+Synapse 1.16.1 (2020-07-10)
+===========================
+
+In some distributions of Synapse 1.16.0, we incorrectly included a database
+migration which added a new, unused table. This release removes the redundant
+table.
+
+Bugfixes
+--------
+
+- Drop table `local_rejections_stream` which was incorrectly added in Synapse 1.16.0. ([\#7816](https://github.com/matrix-org/synapse/issues/7816))
+
+
+Synapse 1.16.1 (2020-07-10)
+===========================
+
+No significant changes.
+
+
Synapse 1.16.0 (2020-07-08)
===========================
diff --git a/changelog.d/7816.bugfix b/changelog.d/7816.bugfix
deleted file mode 100644
index ca9e56d3ce..0000000000
--- a/changelog.d/7816.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Drop table `local_rejections_stream` which was incorrectly added in Synapse 1.16.0.
diff --git a/debian/changelog b/debian/changelog
index 1e7d7191ad..6339f937cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.16.1) stable; urgency=medium
+
+ * New synapse release 1.16.1.
+
+ -- Synapse Packaging team <packages@matrix.org> Fri, 10 Jul 2020 12:09:24 +0100
+
matrix-synapse-py3 (1.16.0) stable; urgency=medium
* New synapse release 1.16.0.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index de65ce6db8..0116478fbb 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
except ImportError:
pass
-__version__ = "1.16.0"
+__version__ = "1.16.1"
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