diff options
| author | Azrenbeth <7782548+Azrenbeth@users.noreply.github.com> | 2021-09-07 17:19:32 +0100 |
|---|---|---|
| committer | Azrenbeth <7782548+Azrenbeth@users.noreply.github.com> | 2021-09-07 17:19:32 +0100 |
| commit | 857b000996bd566eb9e17bac7fbe2369f295e202 (patch) | |
| tree | 32e32b3d13f3e8ca1c3b85b0d724b05ce4cdf9c5 | |
| parent | Use attrs internally for the URL preview code & add documentation. (#10753) (diff) | |
| parent | Add "No significant changes" to changelog (diff) | |
| download | synapse-857b000996bd566eb9e17bac7fbe2369f295e202.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGES.md | 13 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/CHANGES.md b/CHANGES.md index f9659d596d..9908d7d9a0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,11 +1,14 @@ +Synapse 1.42.0 (2021-09-07) +=========================== + +This version of Synapse removes deprecated room-management admin APIs, removes out-of-date email pushers, and improves error handling for fallback templates for user-interactive authentication. For more information on these points, server administrators are encouraged to read [the upgrade notes](docs/upgrade.md#upgrading-to-v1420). + +No significant changes since 1.42.0rc2. + + Synapse 1.42.0rc2 (2021-09-06) ============================== -This version of Synapse removes deprecated room-management admin APIs, removes out-of-date -email pushers, and improves error handling for fallback templates for user-interactive -authentication. For more information on these points, server administrators are -encouraged to read [the upgrade notes](docs/upgrade.md#upgrading-to-v1420). - Features -------- diff --git a/debian/changelog b/debian/changelog index e865e0d2f6..4a37174a94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.42.0) stable; urgency=medium + + * New synapse release 1.42.0. + + -- Synapse Packaging team <packages@matrix.org> Tue, 07 Sep 2021 16:19:09 +0100 + matrix-synapse-py3 (1.42.0~rc2) stable; urgency=medium * New synapse release 1.42.0~rc2. diff --git a/synapse/__init__.py b/synapse/__init__.py index e4302d81a8..dc7ae24295 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.42.0rc2" +__version__ = "1.42.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 |