diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-31 13:44:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-31 13:44:04 +0100 |
commit | 5de936caa1c1d607c39b09909ee983568e31ebb1 (patch) | |
tree | 2ef87b37cdef97b54375d575216dd60039d31d1b /synapse/storage/stream.py | |
parent | Merge pull request #3629 from ptman/patch-1 (diff) | |
parent | reinstate explicit include of EventsWorkerStore (diff) | |
download | synapse-5de936caa1c1d607c39b09909ee983568e31ebb1.tar.xz |
Merge pull request #3612 from matrix-org/rav/store_heirarchy
Make EventStore inherit from EventFederationStore
Diffstat (limited to 'synapse/storage/stream.py')
-rw-r--r-- | synapse/storage/stream.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index 25d0097b58..b9f2b74ac6 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -43,7 +43,7 @@ from twisted.internet import defer from synapse.storage._base import SQLBaseStore from synapse.storage.engines import PostgresEngine -from synapse.storage.events import EventsWorkerStore +from synapse.storage.events_worker import EventsWorkerStore from synapse.types import RoomStreamToken from synapse.util.caches.stream_change_cache import StreamChangeCache from synapse.util.logcontext import make_deferred_yieldable, run_in_background |