summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/9900.bugfix1
-rw-r--r--synapse/__init__.py2
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 9a41607679..bdeb614b9e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.33.0rc2 (2021-04-29)
+==============================
+
+Bugfixes
+--------
+
+- Fix tight loop when handling presence replication when using workers. Introduced in v1.33.0rc1. ([\#9900](https://github.com/matrix-org/synapse/issues/9900))
+
+
 Synapse 1.33.0rc1 (2021-04-28)
 ==============================
 
diff --git a/changelog.d/9900.bugfix b/changelog.d/9900.bugfix
deleted file mode 100644
index a8470fca3f..0000000000
--- a/changelog.d/9900.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix tight loop handling presence replication when using workers. Introduced in v1.33.0rc1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 5bbaa62de2..319c52be2c 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.33.0rc1"
+__version__ = "1.33.0rc2"
 
 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