summary refs log tree commit diff
path: root/synapse/federation/transport/client.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-04 14:29:58 +0000
committerErik Johnston <erik@matrix.org>2016-03-04 14:35:02 +0000
commited61a491692635191b93f075db207a121eb37b66 (patch)
tree15529916444eca9cc590106ed5a05008fa15f1db /synapse/federation/transport/client.py
parentMerge pull request #598 from Rugvip/invite-state (diff)
downloadsynapse-ed61a491692635191b93f075db207a121eb37b66.tar.xz
Add profile information to invites
Diffstat (limited to 'synapse/federation/transport/client.py')
-rw-r--r--synapse/federation/transport/client.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py

index 2b5d40ea7f..2237e3413c 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py
@@ -160,6 +160,7 @@ class TransportLayerClient(object): path=path, args=args, retry_on_dns_fail=retry_on_dns_fail, + timeout=10000, ) defer.returnValue(content)