Merge commit 'c9f7c683a' into anoa/dinsic_release_1_18_x
* commit 'c9f7c683a':
1.16.1
Drop incorrectly-added table `local_rejections_stream`. (#7816)
4 files changed, 42 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index bd8cf1a11f..9c156657c6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,16 @@
+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.17.0rc1 (2020-07-09)
==============================
diff --git a/debian/changelog b/debian/changelog
index f7c146d777..5ce77ce3b4 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.17.0rc1) stable; urgency=medium
* New synapse release 1.17.0rc1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 5bb09a37d7..0116478fbb 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
except ImportError:
pass
-__version__ = "1.17.0rc1"
+__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
diff --git a/synapse/storage/data_stores/main/schema/delta/58/10drop_local_rejections_stream.sql b/synapse/storage/data_stores/main/schema/delta/58/10drop_local_rejections_stream.sql
new file mode 100644
index 0000000000..20ebd52e63
--- /dev/null
+++ b/synapse/storage/data_stores/main/schema/delta/58/10drop_local_rejections_stream.sql
@@ -0,0 +1,22 @@
+/* Copyright 2020 The Matrix.org Foundation C.I.C
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+The version of synapse 1.16.0 on pypi incorrectly contained a migration which
+added a table called 'local_rejections_stream'. This table is not used, and
+we drop it here for anyone who was affected.
+*/
+
+DROP TABLE IF NOT EXISTS local_rejections_stream;
|
