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

2016-05-31 15:46:24 +01:00 · 2016-05-31 15:46:24 +01:00 · fd3108fda6
parent 09970a70e1 1d4ee854e2
commit fd3108fda6
1 changed files with 1 additions and 1 deletions
--- a/synapse/storage/push_rule.py
+++ b/synapse/storage/push_rule.py
@ -94,7 +94,7 @@ class PushRuleStore(SQLBaseStore):
            defer.returnValue({})

        results = {
-            user_id: []
+            user_id: {}
            for user_id in user_ids
        }