Merge branch 'release-v0.13.3' of github.com:matrix-org/synapse

This commit is contained in:
Erik Johnston 2016-02-11 16:04:51 +00:00
commit 7e0a1683e6
3 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
Changes in synapse v0.13.3 (2016-02-11)
=======================================
* Fix bug where ``/sync`` would occasionally return events in the wrong room.
Changes in synapse v0.13.2 (2016-02-11) Changes in synapse v0.13.2 (2016-02-11)
======================================= =======================================

View File

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server. """ This is a reference implementation of a Matrix home server.
""" """
__version__ = "0.13.2" __version__ = "0.13.3"

View File

@ -175,7 +175,7 @@ class StreamStore(SQLBaseStore):
preserve_fn(self.get_room_events_stream_for_room)( preserve_fn(self.get_room_events_stream_for_room)(
room_id, from_key, to_key, limit, order=order, room_id, from_key, to_key, limit, order=order,
) )
for room_id in room_ids for room_id in rm_ids
]) ])
results.update(dict(zip(rm_ids, res))) results.update(dict(zip(rm_ids, res)))