]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f12dc26 9e9f850)
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)
issue23962 - Reference the correct TimeoutError in concurrent.futures documentation.

Patch contributed by Ryder Lewis.


Trivial merge
Mirror of https://github.com/python/cpython.git