summary refs log tree commit diff
path: root/synapse/util/async.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2017-01-05 11:53:15 +0000
committerGitHub <noreply@github.com>2017-01-05 11:53:15 +0000
commit5175094707ca4994d1ff5948b99a532c1d9a3d16 (patch)
tree8d0a392577e2ad482f798c8f66f0a8fa19f830fa /synapse/util/async.py
parentMerge branch 'release-v0.18.6' into develop (diff)
parentfix comment (diff)
downloadsynapse-5175094707ca4994d1ff5948b99a532c1d9a3d16.tar.xz
Merge pull request #1744 from matrix-org/matthew/timeout_get_missing_events
limit total timeout for get_missing_events to 10s
Diffstat (limited to 'synapse/util/async.py')
0 files changed, 0 insertions, 0 deletions