diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-02-23 17:16:03 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-02-23 17:16:03 +0000 |
| commit | bd84755e64a5fd086738a43e049885604ea53927 (patch) | |
| tree | 39b3bf10a5b074c82e48a723670a539b9149a8ee /synapse/handlers/federation.py | |
| parent | Pull the _get_event_cache.setdefault() call out of the try block, as it doesn... (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-bd84755e64a5fd086738a43e049885604ea53927.tar.xz | |
Merge remote-tracking branch 'origin/develop' into performance-cache-improvements
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 0eb2ff95ca..7deed16f9c 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -875,7 +875,7 @@ class FederationHandler(BaseHandler): local_view = dict(auth_events) remote_view = dict(auth_events) remote_view.update({ - (d.type, d.state_key) for d in different_events + (d.type, d.state_key): d for d in different_events }) new_state, prev_state = self.state_handler.resolve_events( |