summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2022-05-16 12:52:29 +0100
committerDavid Robertson <davidr@element.io>2022-05-16 12:52:29 +0100
commitc3b232cb399c5098d27e6eb50e0d350774b0afd3 (patch)
tree98057e4a246c43156833c3e326921e27f98cc193
parentFix bug /sync returning 404 (#12729) (diff)
downloadsynapse-c3b232cb399c5098d27e6eb50e0d350774b0afd3.tar.xz
1.59.0rc2
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/12729.bugfix1
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
4 files changed, 16 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index c625e4d561..ccb5d14326 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.59.0rc2 (2022-05-16)
+==============================
+
+Bugfixes
+--------
+
+- Fix a bug introduced in Synapse 1.58.0 where `/sync` would fail if the most recent event in a room was rejected. ([\#12729](https://github.com/matrix-org/synapse/issues/12729))
+
+
 Synapse 1.59.0rc1 (2022-05-10)
 ==============================
 
diff --git a/changelog.d/12729.bugfix b/changelog.d/12729.bugfix
deleted file mode 100644
index 07aae23ac0..0000000000
--- a/changelog.d/12729.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.58.0 where `/sync` would fail if the most recent event in a room was rejected.
diff --git a/debian/changelog b/debian/changelog
index fabc690bae..7f9bedd7ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.59.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.59.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Mon, 16 May 2022 12:52:15 +0100
+
 matrix-synapse-py3 (1.59.0~rc1) stable; urgency=medium
 
   * Adjust how the `exported-requirements.txt` file is generated as part of
diff --git a/pyproject.toml b/pyproject.toml
index e3d81ae5f1..1a2ddddb10 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ skip_gitignore = true
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.59.0rc1"
+version = "1.59.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"