summary refs log tree commit diff
path: root/synapse/handlers/sync.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-02 16:23:54 +0000
committerErik Johnston <erik@matrix.org>2016-02-02 16:23:54 +0000
commit43e13dbd4d22632a56903826df56cc8aa28be944 (patch)
tree96557786f18ba3f815553d3e4e34354135a7128c /synapse/handlers/sync.py
parentMerge pull request #545 from matrix-org/erikj/sync (diff)
parents/get_room_changes_for_user/get_membership_changes_for_user/ (diff)
downloadsynapse-43e13dbd4d22632a56903826df56cc8aa28be944.tar.xz
Merge pull request #549 from matrix-org/erikj/sync
Fetch events in a separate transaction.
Diffstat (limited to '')
-rw-r--r--synapse/handlers/sync.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index 8d8d10da33..dc686db541 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py
@@ -479,7 +479,7 @@ class SyncHandler(BaseHandler): ) # Get a list of membership change events that have happened. - rooms_changed = yield self.store.get_room_changes_for_user( + rooms_changed = yield self.store.get_membership_changes_for_user( user_id, since_token.room_key, now_token.room_key )