Merge pull request #733 from matrix-org/erikj/make_member_timeout

Lower timeout for make_membership_event
This commit is contained in:
Erik Johnston 2016-04-18 15:08:05 +01:00
commit 4ef7a25c10
1 changed files with 2 additions and 1 deletions

View File

@ -179,7 +179,8 @@ class TransportLayerClient(object):
content = yield self.client.get_json( content = yield self.client.get_json(
destination=destination, destination=destination,
path=path, path=path,
retry_on_dns_fail=True, retry_on_dns_fail=False,
timeout=20000,
) )
defer.returnValue(content) defer.returnValue(content)