diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-07-13 11:42:52 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-07-13 11:42:52 +0100 |
| commit | 59e64b6d5b25734a07f5deb7e4996578b67d7273 (patch) | |
| tree | 4cc73241dd547bcf02e6cfeb45928054b403ce95 | |
| parent | Do not use canonicaljson to magically handle decoding bytes from JSON. (#7802) (diff) | |
| parent | 1.17.0 (diff) | |
| download | synapse-59e64b6d5b25734a07f5deb7e4996578b67d7273.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGES.md | 10 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md index e6e575e5e4..6d4bd23e4e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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) =========================== -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. +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 -------- diff --git a/debian/changelog b/debian/changelog index 5ce77ce3b4..3825603ae4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 * New synapse release 1.16.1. diff --git a/synapse/__init__.py b/synapse/__init__.py index 5bb09a37d7..8592dee179 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.17.0rc1" +__version__ = "1.17.0" 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 |