summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-03-23 12:03:46 +0000
committerRichard van der Hoff <richard@matrix.org>2017-03-23 12:07:11 +0000
commitb88a323ffbe165b8639a2ef5f5791ed65cde3e4b (patch)
tree67c70b8ee6650d1a5594b487c537d71a7bb4b100 /synapse/appservice
parentMerge branch 'master' into develop (diff)
downloadsynapse-b88a323ffbe165b8639a2ef5f5791ed65cde3e4b.tar.xz
Fix time_bound_deferred to throw the right exception
Due to a failure to instantiate DeferredTimedOutError, time_bound_deferred
would throw a CancelledError when the deferred timed out, which was rather
confusing.
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions