summary refs log tree commit diff
path: root/synapse/federation/federation_server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-09-26 13:27:33 +0100
committerRichard van der Hoff <richard@matrix.org>2018-09-26 13:27:33 +0100
commit78825f4f1c91b20c463bbbc2aecbc4f373bb3000 (patch)
treeb06d1883f044bcd2495e18b9d0ec75606c2a18d9 /synapse/federation/federation_server.py
parentRevert "Actuall set cache factors in workers" (diff)
parentMerge branch 'develop' into rav/hacky_cache_factor_fix (diff)
downloadsynapse-78825f4f1c91b20c463bbbc2aecbc4f373bb3000.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r--synapse/federation/federation_server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py

index dbee404ea7..9a571e4fc7 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py
@@ -618,7 +618,7 @@ class FederationServer(FederationBase): ) yield self.handler.on_receive_pdu( - origin, pdu, get_missing=True, sent_to_us_directly=True, + origin, pdu, sent_to_us_directly=True, ) def __str__(self):