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

takbok · Feb 11, 2016 · 7e0a168 · 7e0a168
2 parents 88a973c + 2a24f90
commit 7e0a168
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -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)
 =======================================
 

diff --git a/synapse/__init__.py b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.13.2"
+__version__ = "0.13.3"
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
@@ -175,7 +175,7 @@ def get_room_events_stream_for_rooms(self, room_ids, from_key, to_key, limit=0,
                 preserve_fn(self.get_room_events_stream_for_room)(
                     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)))