summary refs log tree commit diff
path: root/synapse/federation/federation_client.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-03-20 17:25:41 +0000
committerErik Johnston <erik@matrix.org>2017-03-20 17:25:41 +0000
commite0e214556a82370528ef1f9943773c42270c5336 (patch)
tree7fcbb016a63202eb1733e6b69a4999ba94193e8c /synapse/federation/federation_client.py
parentMerge pull request #2028 from majewsky/readme-fix-1 (diff)
parentBump changelog and version (diff)
downloadsynapse-e0e214556a82370528ef1f9943773c42270c5336.tar.xz
Merge branch 'release-v0.19.3' of github.com:matrix-org/synapse v0.19.3
Diffstat (limited to 'synapse/federation/federation_client.py')
-rw-r--r--synapse/federation/federation_client.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index b5bcfd705a..5dcd4eecce 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -206,8 +206,7 @@ class FederationClient(FederationBase):
 
         Args:
             destinations (list): Which home servers to query
-            pdu_origin (str): The home server that originally sent the pdu.
-            event_id (str)
+            event_id (str): event to fetch
             outlier (bool): Indicates whether the PDU is an `outlier`, i.e. if
                 it's from an arbitary point in the context as opposed to part
                 of the current block of PDUs. Defaults to `False`