diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2017-01-05 13:58:19 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2017-01-05 13:58:19 +0000 |
| commit | bd85434cb398a8272a1276574db4d28dc76f7f3f (patch) | |
| tree | bbecac7c1e86ba5a863f1a36fb7f9d9a1a9c6d7d /synapse/handlers | |
| parent | Merge branch 'release-v0.18.6' into develop (diff) | |
| parent | Fix flake8 and update changelog (diff) | |
| download | synapse-bd85434cb398a8272a1276574db4d28dc76f7f3f.tar.xz | |
Merge branch 'release-v0.18.6' into develop
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/federation.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 8c93d6d39f..1021bcc405 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -591,6 +591,7 @@ class FederationHandler(BaseHandler): event_ids = list(extremities.keys()) + logger.info("calling resolve_state_groups in _maybe_backfill") states = yield preserve_context_over_deferred(defer.gatherResults([ preserve_fn(self.state_handler.resolve_state_groups)(room_id, [e]) for e in event_ids |