summary refs log tree commit diff
path: root/synapse/storage/event_federation.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-08-02 15:43:30 +0100
committerRichard van der Hoff <richard@matrix.org>2018-08-02 15:43:30 +0100
commit704c3e62399b47970b1d319740e591a6f08366da (patch)
tree5e906af495e6f27ebd7977810dd3979efca7d35a /synapse/storage/event_federation.py
parentMerge pull request #3621 from matrix-org/erikj/split_fed_store (diff)
parentMerge tag 'v0.33.1' (diff)
downloadsynapse-704c3e62399b47970b1d319740e591a6f08366da.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/storage/event_federation.py')
-rw-r--r--synapse/storage/event_federation.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py
index 8bd35df119..24345b20a6 100644
--- a/synapse/storage/event_federation.py
+++ b/synapse/storage/event_federation.py
@@ -343,6 +343,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore,
                 table="events",
                 keyvalues={
                     "event_id": event_id,
+                    "room_id": room_id,
                 },
                 retcol="depth",
                 allow_none=True,