summary refs log tree commit diff
path: root/synapse/replication/http
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-07-28 11:31:31 +0100
committerRichard van der Hoff <richard@matrix.org>2020-07-28 11:31:31 +0100
commit349119a340d3aa0a9fc0082eabc15534f6f7da96 (patch)
treea6aaaa4c536f1ef8463df55910b793f11dcfe07f /synapse/replication/http
parentFix typo in metrics docs (#7966) (diff)
parent1.18.0rc2 (diff)
downloadsynapse-349119a340d3aa0a9fc0082eabc15534f6f7da96.tar.xz
Merge tag 'v1.18.0rc2' into develop
Synapse 1.18.0rc2 (2020-07-28)
==============================

Bugfixes
--------

- Fix an `AssertionError` exception introduced in v1.18.0rc1. ([\#7876](https://github.com/matrix-org/synapse/issues/7876))
- Fix experimental support for moving typing off master when worker is restarted, which is broken in v1.18.0rc1. ([\#7967](https://github.com/matrix-org/synapse/issues/7967))

Internal Changes
----------------

- Further optimise queueing of inbound replication commands. ([\#7876](https://github.com/matrix-org/synapse/issues/7876))
Diffstat (limited to 'synapse/replication/http')
-rw-r--r--synapse/replication/http/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/http/__init__.py b/synapse/replication/http/__init__.py
index 5ef1c6c1dc..a84a064c8d 100644
--- a/synapse/replication/http/__init__.py
+++ b/synapse/replication/http/__init__.py
@@ -39,10 +39,10 @@ class ReplicationRestResource(JsonResource):
         federation.register_servlets(hs, self)
         presence.register_servlets(hs, self)
         membership.register_servlets(hs, self)
+        streams.register_servlets(hs, self)
 
         # The following can't currently be instantiated on workers.
         if hs.config.worker.worker_app is None:
             login.register_servlets(hs, self)
             register.register_servlets(hs, self)
             devices.register_servlets(hs, self)
-            streams.register_servlets(hs, self)