Merge branch 'master' into develop

pull/7827/head
Richard van der Hoff 2020-07-13 11:42:52 +01:00
commit 59e64b6d5b
3 changed files with 14 additions and 4 deletions

View File

@ -1,9 +1,13 @@
Synapse 1.17.0 (2020-07-13)
===========================
Synapse 1.17.0 is identical to 1.17.0rc1, with the addition of the fix that was included in 1.16.1.
Synapse 1.16.1 (2020-07-10) Synapse 1.16.1 (2020-07-10)
=========================== ===========================
In some distributions of Synapse 1.16.0, we incorrectly included a database 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.
migration which added a new, unused table. This release removes the redundant
table.
Bugfixes Bugfixes
-------- --------

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
matrix-synapse-py3 (1.17.0) stable; urgency=medium
* New synapse release 1.17.0.
-- Synapse Packaging team <packages@matrix.org> Mon, 13 Jul 2020 10:20:31 +0100
matrix-synapse-py3 (1.16.1) stable; urgency=medium matrix-synapse-py3 (1.16.1) stable; urgency=medium
* New synapse release 1.16.1. * New synapse release 1.16.1.

View File

@ -36,7 +36,7 @@ try:
except ImportError: except ImportError:
pass pass
__version__ = "1.17.0rc1" __version__ = "1.17.0"
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): 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 # We import here so that we don't have to install a bunch of deps when