Merge branch 'master' into develop

This commit is contained in:
Andrew Morgan 2022-01-18 11:46:24 +00:00
commit 47961ea855
3 changed files with 15 additions and 4 deletions

View File

@ -1,11 +1,16 @@
Synapse 1.50.0 (2022-01-18)
===========================
Please note that we now only support Python 3.7+ and PostgreSQL 10+ (if applicable), because Python 3.6 and PostgreSQL 9.6 have reached end-of-life.
No significant changes since 1.50.0rc2.
Synapse 1.50.0rc2 (2022-01-14) Synapse 1.50.0rc2 (2022-01-14)
============================== ==============================
This release candidate fixes a federation-breaking regression introduced in Synapse 1.50.0rc1. This release candidate fixes a federation-breaking regression introduced in Synapse 1.50.0rc1.
Please note that we now only support Python 3.7+ and PostgreSQL 10+ (if applicable), because Python 3.6 and PostgreSQL 9.6 have reached end-of-life.
Bugfixes Bugfixes
-------- --------

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
matrix-synapse-py3 (1.50.0) stable; urgency=medium
* New synapse release 1.50.0.
-- Synapse Packaging team <packages@matrix.org> Tue, 18 Jan 2022 10:40:38 +0000
matrix-synapse-py3 (1.50.0~rc2) stable; urgency=medium matrix-synapse-py3 (1.50.0~rc2) stable; urgency=medium
* New synapse release 1.50.0~rc2. * New synapse release 1.50.0~rc2.

View File

@ -47,7 +47,7 @@ try:
except ImportError: except ImportError:
pass pass
__version__ = "1.50.0rc2" __version__ = "1.50.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