summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-04-27 14:32:54 +0100
committerGitHub <noreply@github.com>2018-04-27 14:32:54 +0100
commit955823672842b2102c4c6e204f81efbcd67200bc (patch)
treed70648dd1b7466452da27a4b7d8993c58481ed03 /synapse/storage
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentMerge remote-tracking branch 'origin/develop' into rav/deferred_timeout (diff)
downloadsynapse-955823672842b2102c4c6e204f81efbcd67200bc.tar.xz
Merge pull request #3127 from matrix-org/rav/deferred_timeout
Use deferred.addTimeout instead of time_bound_deferred
Diffstat (limited to 'synapse/storage')
0 files changed, 0 insertions, 0 deletions