]> granicus.if.org Git - python/commit
merge from 3.5
authorSenthil Kumaran <senthil@uthcode.com>
Tue, 19 Jan 2016 02:45:54 +0000 (18:45 -0800)
committerSenthil Kumaran <senthil@uthcode.com>
Tue, 19 Jan 2016 02:45:54 +0000 (18:45 -0800)
commit3114d763fb0eb469dcae24b616c727303261b30f
treed1cacbe09d479d291aa10fd9c50024ea6a360a8b
parentf12dc26c668750d8d5b856765c038332cc62e8c5
parent9e9f850f9912228a8963f94f4b0480215a6c168c
merge from 3.5

issue23962 - Reference the correct TimeoutError in concurrent.futures documentation.

Patch contributed by Ryder Lewis.