Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-09 11:12:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into erikj/reactor_metrics

Browse source
This commit is contained in:
Mark Haines 2015-08-13 17:03:58 +01:00
commit 3d1cdda762
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
setup.cfg
View file

@ -16,3 +16,6 @@ ignore =
docs/* docs/*
pylint.cfg pylint.cfg
tox.ini tox.ini
[flake8]
max-line-length = 90

1
synapse/http/matrixfederationclient.py
View file

@ -142,7 +142,6 @@ class MatrixFederationHttpClient(object):
producer producer
) )
return self.clock.time_bound_deferred( return self.clock.time_bound_deferred(
request_deferred, request_deferred,
time_out=timeout/1000. if timeout else 60, time_out=timeout/1000. if timeout else 60,