5 files changed, 12 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 48e9b55c8a..aeec4fa5fa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,14 @@
+Synapse 1.36.0rc2 (2021-06-11)
+==============================
+
+Bugfixes
+--------
+
+- Fix a bug which caused presence updates to stop working some time after a restart, when using a presence writer worker. Broke in v1.33.0. ([\#10149](https://github.com/matrix-org/synapse/issues/10149))
+- Fix a bug when using federation sender worker where it would send out more presence updates than necessary, leading to high resource usage. Broke in v1.33.0. ([\#10163](https://github.com/matrix-org/synapse/issues/10163))
+- Fix a bug where Synapse could send the same presence update to a remote twice. ([\#10165](https://github.com/matrix-org/synapse/issues/10165))
+
+
Synapse 1.36.0rc1 (2021-06-08)
==============================
diff --git a/changelog.d/10149.bugfix b/changelog.d/10149.bugfix
deleted file mode 100644
index cb2d2eedb3..0000000000
--- a/changelog.d/10149.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug which caused presence updates to stop working some time after restart, when using a presence writer worker.
diff --git a/changelog.d/10163.bugfix b/changelog.d/10163.bugfix
deleted file mode 100644
index 7ccde66743..0000000000
--- a/changelog.d/10163.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug when using federation sender worker where it would send out more presence updates than necessary, leading to high resource usage. Broke in v1.33.0.
diff --git a/changelog.d/10165.bugfix b/changelog.d/10165.bugfix
deleted file mode 100644
index 8b1eeff352..0000000000
--- a/changelog.d/10165.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where Synapse could send the same presence update to a remote twice.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 58261d04ef..407ba14a76 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
except ImportError:
pass
-__version__ = "1.36.0rc1"
+__version__ = "1.36.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
|
