diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2018-03-14 15:38:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-14 15:38:05 +0000 |
| commit | 056a6df5462d45eeb4cc9870492f6147677e7213 (patch) | |
| tree | a3a4c576bfd2749d297315a9e6b5cd3f53161d87 /synapse/replication/http/__init__.py | |
| parent | pep8 (diff) | |
| parent | Merge pull request #2995 from matrix-org/erikj/enable_membership_worker (diff) | |
| download | synapse-056a6df5462d45eeb4cc9870492f6147677e7213.tar.xz | |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/replication/http/__init__.py')
| -rw-r--r-- | synapse/replication/http/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/replication/http/__init__.py b/synapse/replication/http/__init__.py index b378b41646..1d7a607529 100644 --- a/synapse/replication/http/__init__.py +++ b/synapse/replication/http/__init__.py @@ -13,10 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. - -import send_event - from synapse.http.server import JsonResource +from synapse.replication.http import membership, send_event REPLICATION_PREFIX = "/_synapse/replication" @@ -29,3 +27,4 @@ class ReplicationRestResource(JsonResource): def register_servlets(self, hs): send_event.register_servlets(hs, self) + membership.register_servlets(hs, self) |