mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-07 23:11:59 +00:00
Merge branch 'develop' into erikj/reactor_metrics
This commit is contained in:
commit
3d1cdda762
@ -16,3 +16,6 @@ ignore =
|
||||
docs/*
|
||||
pylint.cfg
|
||||
tox.ini
|
||||
|
||||
[flake8]
|
||||
max-line-length = 90
|
||||
|
@ -142,7 +142,6 @@ class MatrixFederationHttpClient(object):
|
||||
producer
|
||||
)
|
||||
|
||||
|
||||
return self.clock.time_bound_deferred(
|
||||
request_deferred,
|
||||
time_out=timeout/1000. if timeout else 60,
|
||||
|
Loading…
Reference in New Issue
Block a user