From 3a676b8ee300613f87f0d17f96b05fceee861ac1 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Thu, 21 Apr 2016 16:25:19 +0100 Subject: More merging --- synapse/app/pusher.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'synapse/app/pusher.py') diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py index fbed9763c0..27f878e429 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py @@ -23,7 +23,6 @@ from synapse.config.database import DatabaseConfig from synapse.config.logger import LoggingConfig from synapse.replication.slave.storage.events import SlavedEventStore from synapse.replication.slave.storage.pushers import SlavedPusherStore -from synapse.replication.slave.storage.event_push_actions import SlavedPushActionsStore from synapse.replication.slave.storage.receipts import SlavedReceiptsStore from synapse.storage.engines import create_engine from synapse.storage import DataStore @@ -60,9 +59,7 @@ class PusherSlaveConfig(SlaveConfig, LoggingConfig): class PusherSlaveStore( - SlavedPushActionsStore, - SlavedEventStore, SlavedPusherStore, - SlavedReceiptsStore + SlavedEventStore, SlavedPusherStore, SlavedReceiptsStore ): update_pusher_last_stream_ordering_and_success = ( DataStore.update_pusher_last_stream_ordering_and_success.__func__ -- cgit 1.5.1