diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-15 16:27:08 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-15 16:27:08 +0100 |
commit | 86a00e05e1db0fd4fa7a0192520504c229b6f79c (patch) | |
tree | 17c0ac3804e223913549a50cfa6c5d5616824568 /synapse/app/event_creator.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by... (diff) | |
parent | Merge pull request #3653 from matrix-org/erikj/split_federation (diff) | |
download | synapse-86a00e05e1db0fd4fa7a0192520504c229b6f79c.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
Diffstat (limited to 'synapse/app/event_creator.py')
-rw-r--r-- | synapse/app/event_creator.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/event_creator.py b/synapse/app/event_creator.py index a385793dd4..03d39968a8 100644 --- a/synapse/app/event_creator.py +++ b/synapse/app/event_creator.py @@ -43,7 +43,7 @@ from synapse.replication.slave.storage.pushers import SlavedPusherStore from synapse.replication.slave.storage.receipts import SlavedReceiptsStore from synapse.replication.slave.storage.registration import SlavedRegistrationStore from synapse.replication.slave.storage.room import RoomStore -from synapse.replication.slave.storage.transactions import TransactionStore +from synapse.replication.slave.storage.transactions import SlavedTransactionStore from synapse.replication.tcp.client import ReplicationClientHandler from synapse.rest.client.v1.room import ( JoinRoomAliasServlet, @@ -63,7 +63,7 @@ logger = logging.getLogger("synapse.app.event_creator") class EventCreatorSlavedStore( DirectoryStore, - TransactionStore, + SlavedTransactionStore, SlavedProfileStore, SlavedAccountDataStore, SlavedPusherStore, |