Merge branch 'master' into develop

This commit is contained in:
Erik Johnston 2021-05-17 12:14:58 +01:00
commit 653fe2f3cd
4 changed files with 25 additions and 15 deletions

View File

@ -1,10 +1,17 @@
Synapse 1.34.0rc1 (2021-05-12) Synapse 1.34.0 (2021-05-17)
============================== ===========================
This release deprecates the `room_invite_state_types` configuration setting. See the [upgrade notes](https://github.com/matrix-org/synapse/blob/release-v1.34.0/UPGRADE.rst#upgrading-to-v1340) for instructions on updating your configuration file to use the new `room_prejoin_state` setting. This release deprecates the `room_invite_state_types` configuration setting. See the [upgrade notes](https://github.com/matrix-org/synapse/blob/release-v1.34.0/UPGRADE.rst#upgrading-to-v1340) for instructions on updating your configuration file to use the new `room_prejoin_state` setting.
This release also deprecates the `POST /_synapse/admin/v1/rooms/<room_id>/delete` admin API route. Server administrators are encouraged to update their scripts to use the new `DELETE /_synapse/admin/v1/rooms/<room_id>` route instead. This release also deprecates the `POST /_synapse/admin/v1/rooms/<room_id>/delete` admin API route. Server administrators are encouraged to update their scripts to use the new `DELETE /_synapse/admin/v1/rooms/<room_id>` route instead.
No significant changes since v1.34.0rc1.
Synapse 1.34.0rc1 (2021-05-12)
==============================
Features Features
-------- --------

View File

@ -88,7 +88,7 @@ for example:
Upgrading to v1.34.0 Upgrading to v1.34.0
==================== ====================
`room_invite_state_types` configuration setting ``room_invite_state_types`` configuration setting
----------------------------------------------- -----------------------------------------------
The ``room_invite_state_types`` configuration setting has been deprecated and The ``room_invite_state_types`` configuration setting has been deprecated and
@ -106,13 +106,10 @@ remove it from your configuration file. The default value used to be:
- "m.room.encryption" - "m.room.encryption"
- "m.room.name" - "m.room.name"
If you have customised this value by adding addition state types, you should If you have customised this value, you should remove ``room_invite_state_types`` and
remove ``room_invite_state_types`` and configure ``additional_event_types`` with configure ``room_prejoin_state`` instead.
your customisations.
If you have customised this value by removing state types, you should rename
``room_invite_state_types`` to ``additional_event_types``, and set
``disable_default_event_types`` to ``true``.
Upgrading to v1.33.0 Upgrading to v1.33.0
==================== ====================

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
matrix-synapse-py3 (1.34.0) stable; urgency=medium
* New synapse release 1.34.0.
-- Synapse Packaging team <packages@matrix.org> Mon, 17 May 2021 11:34:18 +0100
matrix-synapse-py3 (1.33.2) stable; urgency=medium matrix-synapse-py3 (1.33.2) stable; urgency=medium
* New synapse release 1.33.2. * New synapse release 1.33.2.

View File

@ -47,7 +47,7 @@ try:
except ImportError: except ImportError:
pass pass
__version__ = "1.34.0rc1" __version__ = "1.34.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