summary refs log tree commit diff
path: root/synapse/replication
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-02-02 15:23:45 +0000
committerErik Johnston <erik@matrix.org>2017-02-02 15:23:45 +0000
commit99fa03e8b55eee0d69f654ba61c3f31f9f6afde1 (patch)
tree5eccc1feae37e9ba87085718a6340e1d0147ad2f /synapse/replication
parentsets aren't JSON serializable (diff)
parentMerge pull request #1876 from matrix-org/erikj/shared_member_store (diff)
downloadsynapse-99fa03e8b55eee0d69f654ba61c3f31f9f6afde1.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/device_list_fixes
Diffstat (limited to 'synapse/replication')
-rw-r--r--synapse/replication/slave/storage/events.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py

index 15a025a019..d72ff6055c 100644 --- a/synapse/replication/slave/storage/events.py +++ b/synapse/replication/slave/storage/events.py
@@ -73,6 +73,9 @@ class SlavedEventStore(BaseSlavedStore): # to reach inside the __dict__ to extract them. get_rooms_for_user = RoomMemberStore.__dict__["get_rooms_for_user"] get_users_in_room = RoomMemberStore.__dict__["get_users_in_room"] + get_users_who_share_room_with_user = ( + RoomMemberStore.__dict__["get_users_who_share_room_with_user"] + ) get_latest_event_ids_in_room = EventFederationStore.__dict__[ "get_latest_event_ids_in_room" ]