Merge branch 'master' into develop
5 files changed, 18 insertions, 6 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 748f6833ca..74a5dbf424 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,15 @@
-Synapse 1.57.0rc1 (2022-04-12)
-==============================
+Synapse 1.57.0 (2022-04-19)
+===========================
This version includes a [change](https://github.com/matrix-org/synapse/pull/12209) to the way transaction IDs are managed for application services. If your deployment uses a dedicated worker for application service traffic, **it must be stopped** when the database is upgraded (which normally happens when the main process is upgraded), to ensure the change is made safely without any risk of reusing transaction IDs.
-See the [upgrade notes](https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md#upgrading-to-v1570) for more details.
+See the [upgrade notes](https://github.com/matrix-org/synapse/blob/v1.57.0rc1/docs/upgrade.md#upgrading-to-v1570) for more details.
+
+No significant changes since 1.57.0rc1.
+
+
+Synapse 1.57.0rc1 (2022-04-12)
+==============================
Features
--------
diff --git a/debian/changelog b/debian/changelog
index fdbc92df6b..a44f7d98ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ matrix-synapse-py3 (1.58.0+nmu1) UNRELEASED; urgency=medium
-- Synapse Packaging Team <packages@matrix.org> Wed, 30 Mar 2022 12:21:43 +0100
+matrix-synapse-py3 (1.57.0) stable; urgency=medium
+
+ * New synapse release 1.57.0.
+
+ -- Synapse Packaging team <packages@matrix.org> Tue, 19 Apr 2022 10:58:42 +0100
+
matrix-synapse-py3 (1.57.0~rc1) stable; urgency=medium
* New synapse release 1.57.0~rc1.
diff --git a/docs/upgrade.md b/docs/upgrade.md
index d5516dfc99..a0c797ea9f 100644
--- a/docs/upgrade.md
+++ b/docs/upgrade.md
@@ -103,7 +103,7 @@ worker for application service traffic, **it must be stopped** when the database
without any risk of reusing transaction IDs.
Deployments which do not use separate worker processes can be upgraded as normal. Similarly,
-deployments where no applciation services are in use can be upgraded as normal.
+deployments where no application services are in use can be upgraded as normal.
<details>
<summary><b>Recovering from an incorrect upgrade</b></summary>
diff --git a/pyproject.toml b/pyproject.toml
index 2a3637a7f0..7f58c37e3f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ skip_gitignore = true
[tool.poetry]
name = "matrix-synapse"
-version = "1.56.0"
+version = "1.57.0"
description = "Homeserver for the Matrix decentralised comms protocol"
authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
license = "Apache-2.0"
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 7cdd921366..bf88f1d93d 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -68,7 +68,7 @@ try:
except ImportError:
pass
-__version__ = "1.57.0rc1"
+__version__ = "1.57.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
|
