summary refs log tree commit diff
path: root/synapse/replication/slave
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-06-25 14:37:13 +0100
committerErik Johnston <erik@matrix.org>2018-06-25 14:37:13 +0100
commit4c22c9b0b6d857512c66ec6fdc03e383b8c47af3 (patch)
treeeb406b0cf027fcc7f9db1d67c9999f65ac8b6140 /synapse/replication/slave
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentMerge pull request #3441 from matrix-org/erikj/redo_erasure (diff)
downloadsynapse-4c22c9b0b6d857512c66ec6fdc03e383b8c47af3.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/replication/slave')
-rw-r--r--synapse/replication/slave/storage/events.py2
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):