diff options
author | Jeroen <vo.jeroen@gmail.com> | 2018-07-09 08:51:11 +0200 |
---|---|---|
committer | Jeroen <vo.jeroen@gmail.com> | 2018-07-09 08:51:11 +0200 |
commit | b5e157d895dcf182d7ffc58edf6442deeaebc3f0 (patch) | |
tree | a3f8a4549d0fe4947bef34632218b41c94202b19 /synapse/replication/slave | |
parent | take idna implementation from twisted (diff) | |
parent | Add an isort configuration (#3463) (diff) | |
download | synapse-b5e157d895dcf182d7ffc58edf6442deeaebc3f0.tar.xz |
Merge branch 'develop' into send_sni_for_federation_requests
# Conflicts: # synapse/http/endpoint.py
Diffstat (limited to 'synapse/replication/slave')
-rw-r--r-- | synapse/replication/slave/storage/events.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py index b1f64ef0d8..97d3196633 100644 --- a/synapse/replication/slave/storage/events.py +++ b/synapse/replication/slave/storage/events.py @@ -23,6 +23,7 @@ from synapse.storage.roommember import RoomMemberWorkerStore from synapse.storage.state import StateGroupWorkerStore from synapse.storage.stream import StreamWorkerStore from synapse.storage.signatures import SignatureWorkerStore +from synapse.storage.user_erasure_store import UserErasureWorkerStore from ._base import BaseSlavedStore from ._slaved_id_tracker import SlavedIdTracker @@ -45,6 +46,7 @@ class SlavedEventStore(EventFederationWorkerStore, EventsWorkerStore, StateGroupWorkerStore, SignatureWorkerStore, + UserErasureWorkerStore, BaseSlavedStore): def __init__(self, db_conn, hs): |