summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--CHANGES.md10
-rw-r--r--changelog.d/8139.bugfix1
-rw-r--r--changelog.d/8153.bugfix1
-rw-r--r--synapse/__init__.py2
4 files changed, 11 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index d4cc179489..89fee07db9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+Synapse 1.19.1rc1 (2020-08-25)
+==============================
+
+Bugfixes
+--------
+
+- Fixes a bug where appservices with ratelimiting disabled would still be ratelimited when joining rooms. This bug was introduced in v1.19.0. ([\#8139](https://github.com/matrix-org/synapse/issues/8139))
+- Fix a bug introduced in v1.19.0 that would cause e.g. profile updates to fail due to incorrect application of rate limits on join requests. ([\#8153](https://github.com/matrix-org/synapse/issues/8153))
+
+
 Synapse 1.19.0 (2020-08-17)
 ===========================
 
diff --git a/changelog.d/8139.bugfix b/changelog.d/8139.bugfix
deleted file mode 100644
index 21f65d87b7..0000000000
--- a/changelog.d/8139.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixes a bug where appservices with ratelimiting disabled would still be ratelimited when joining rooms. This bug was introduced in v1.19.0. 
diff --git a/changelog.d/8153.bugfix b/changelog.d/8153.bugfix
deleted file mode 100644
index 87a1f46ca1..0000000000
--- a/changelog.d/8153.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in v1.19.0 that would cause e.g. profile updates to fail due to incorrect application of rate limits on join requests.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index f493cbd7d1..2195723613 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.19.0"
+__version__ = "1.19.1rc1"
 
 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