diff options
| author | Erik Johnston <erikj@jki.re> | 2018-08-15 14:59:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 14:59:02 +0100 |
| commit | dc56c47dc0991c4ddd5de59224c5f55c8fad5287 (patch) | |
| tree | 083791ba6e3b5a80e4b8d51482b986e30bddd309 /synapse/app/media_repository.py | |
| parent | Merge pull request #3687 from matrix-org/neilj/admin_email (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede... (diff) | |
| download | synapse-dc56c47dc0991c4ddd5de59224c5f55c8fad5287.tar.xz | |
Merge pull request #3653 from matrix-org/erikj/split_federation
Move more federation APIs to workers
Diffstat (limited to 'synapse/app/media_repository.py')
| -rw-r--r-- | synapse/app/media_repository.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/media_repository.py b/synapse/app/media_repository.py index 1423056732..fd1f6cbf7e 100644 --- a/synapse/app/media_repository.py +++ b/synapse/app/media_repository.py @@ -34,7 +34,7 @@ from synapse.replication.slave.storage._base import BaseSlavedStore from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore from synapse.replication.slave.storage.client_ips import SlavedClientIpStore from synapse.replication.slave.storage.registration import SlavedRegistrationStore -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.media.v0.content_repository import ContentRepoResource from synapse.server import HomeServer @@ -52,7 +52,7 @@ class MediaRepositorySlavedStore( SlavedApplicationServiceStore, SlavedRegistrationStore, SlavedClientIpStore, - TransactionStore, + SlavedTransactionStore, BaseSlavedStore, MediaRepositoryStore, ): |