diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-11-18 12:05:36 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-11-18 12:05:36 +0000 |
| commit | 870c00e278a8156cf67f8c916c39215ef2333b56 (patch) | |
| tree | 6a3fb77c7d8b1c2f9d919e1aa3b91de8a61567ab /synapse/federation/transport/client.py | |
| parent | newsfile (diff) | |
| parent | Replace UPDATE with UPSERT on device_max_stream_id table (#6363) (diff) | |
| download | synapse-870c00e278a8156cf67f8c916c39215ef2333b56.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/event_auth/4
Diffstat (limited to 'synapse/federation/transport/client.py')
| -rw-r--r-- | synapse/federation/transport/client.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index 920fa86853..dc95ab2113 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -44,7 +44,7 @@ class TransportLayerClient(object): given event. Args: - destination (str): The host name of the remote home server we want + destination (str): The host name of the remote homeserver we want to get the state from. context (str): The name of the context we want the state of event_id (str): The event we want the context at. @@ -68,7 +68,7 @@ class TransportLayerClient(object): given event. Returns the state's event_id's Args: - destination (str): The host name of the remote home server we want + destination (str): The host name of the remote homeserver we want to get the state from. context (str): The name of the context we want the state of event_id (str): The event we want the context at. @@ -91,7 +91,7 @@ class TransportLayerClient(object): """ Requests the pdu with give id and origin from the given server. Args: - destination (str): The host name of the remote home server we want + destination (str): The host name of the remote homeserver we want to get the state from. event_id (str): The id of the event being requested. timeout (int): How long to try (in ms) the destination for before |