diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-07-10 18:38:18 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-07-10 18:38:18 +0100 |
| commit | 8ccb7f08d9868bb0cb96836adb51418d28639090 (patch) | |
| tree | e70b857938d58daf7346513efa7202d312657d59 | |
| parent | 1.17.0rc1 (diff) | |
| parent | update changelog (diff) | |
| download | synapse-8ccb7f08d9868bb0cb96836adb51418d28639090.tar.xz | |
Merge branch 'master' into release-v1.17.0
| -rw-r--r-- | CHANGES.md | 13 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | synapse/storage/data_stores/main/schema/delta/58/10drop_local_rejections_stream.sql | 22 |
3 files changed, 41 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md index bd8cf1a11f..e6e575e5e4 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), [b1beb3ff5](https://github.com/matrix-org/synapse/commit/b1beb3ff5)) + + 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/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..eb57203e46 --- /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 EXISTS local_rejections_stream; |