diff options
author | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2020-08-17 14:28:49 +0100 |
---|---|---|
committer | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2020-08-17 14:28:49 +0100 |
commit | 8390e00c7fbadfa0508b954129e113fe6c2e6f83 (patch) | |
tree | 35c7cda003c849fc742d927a016271ace7e2c575 | |
parent | Convert stream database to async/await. (#8074) (diff) | |
parent | Changelog changes (diff) | |
download | synapse-8390e00c7fbadfa0508b954129e113fe6c2e6f83.tar.xz |
Merge branch 'master' into develop
-rw-r--r-- | CHANGES.md | 9 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/CHANGES.md b/CHANGES.md index a2c8232be1..d4cc179489 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,7 @@ -Synapse 1.19.0rc1 (2020-08-13) -============================== +Synapse 1.19.0 (2020-08-17) +=========================== + +No significant changes since 1.19.0rc1. Removal warning --------------- @@ -7,6 +9,9 @@ Removal warning As outlined in the [previous release](https://github.com/matrix-org/synapse/releases/tag/v1.18.0), we are no longer publishing Docker images with the `-py3` tag suffix. On top of that, we have also removed the `latest-py3` tag. Please see [the announcement in the upgrade notes for 1.18.0](https://github.com/matrix-org/synapse/blob/develop/UPGRADE.rst#upgrading-to-v1180). +Synapse 1.19.0rc1 (2020-08-13) +============================== + Features -------- diff --git a/debian/changelog b/debian/changelog index a0af2b78a8..bdaf59e9b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,12 @@ -matrix-synapse-py3 (1.xx.0) stable; urgency=medium +matrix-synapse-py3 (1.19.0) stable; urgency=medium [ Synapse Packaging team ] - * New synapse release 1.xx.0. + * New synapse release 1.19.0. [ Aaron Raimist ] * Fix outdated documentation for SYNAPSE_CACHE_FACTOR - -- Synapse Packaging team <packages@matrix.org> XXXXX + -- Synapse Packaging team <packages@matrix.org> Mon, 17 Aug 2020 14:06:42 +0100 matrix-synapse-py3 (1.18.0) stable; urgency=medium diff --git a/synapse/__init__.py b/synapse/__init__.py index 832a8e2014..f493cbd7d1 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.19.0rc1" +__version__ = "1.19.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 |