Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timings

2016-06-01 18:02:43 +01:00 · 2016-06-01 18:02:43 +01:00 · 9e54d865e6
parent de580a94b5 83b70c9f63
commit 9e54d865e6
1 changed files with 1 additions and 1 deletions
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@ -441,7 +441,7 @@ class RoomListHandler(BaseHandler):
            self.hs.config.secondary_directory_servers
        )
        self.remote_list_request_cache.set((), deferred)
-        yield deferred
+        self.remote_list_cache = yield deferred

    @defer.inlineCallbacks
    def get_aggregated_public_room_list(self):