diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2022-01-18 11:46:24 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2022-01-18 11:46:24 +0000 |
| commit | 47961ea85522df3f3af8f31d5ecdc815828ddf46 (patch) | |
| tree | 1531a3a2f5f40470573a19b0dd628362157cc5da | |
| parent | Add a flag to the `synapse_review_recent_signups` script to ignore and filter... (diff) | |
| parent | Move python/postgres deprecation notice to the top of 1.50 changelog (diff) | |
| download | synapse-47961ea85522df3f3af8f31d5ecdc815828ddf46.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGES.md | 11 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md index 8f53ce6c51..8029a9d21c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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) ============================== 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 -------- diff --git a/debian/changelog b/debian/changelog index 381980f468..f1245cd3af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 * New synapse release 1.50.0~rc2. diff --git a/synapse/__init__.py b/synapse/__init__.py index f2dac4e7de..201925e91d 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.50.0rc2" +__version__ = "1.50.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 |