]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
projects / thirdparty / tornado.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ec4d8d 932dcc7)
Merge pull request #936 from ticosax/add-timeout-on-future
authorbdarnell <ben@bendarnell.com>
Sun, 1 Dec 2013 14:44:09 +0000 (06:44 -0800)
committerbdarnell <ben@bendarnell.com>
Sun, 1 Dec 2013 14:44:09 +0000 (06:44 -0800)
Pass timeout argument to Future.result


Trivial merge
Mirror of https://github.com/tornadoweb/tornado.git