From: bdarnell <ben@bendarnell.com>
Date: Sun, 1 Dec 2013 14:44:09 +0000 (-0800)
Subject: Merge pull request #936 from ticosax/add-timeout-on-future
X-Git-Tag: v3.2.0b1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=237018db3579eac90a37ce17e5885d626fe52cbb;p=thirdparty%2Ftornado.git

Merge pull request #936 from ticosax/add-timeout-on-future

Pass timeout argument to Future.result
---

237018db3579eac90a37ce17e5885d626fe52cbb