summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Cut 1.12.2v1.12.21.12.2Jeff Forcier2014-02-143-2/+3
* Merge branch '1.11' into 1.12Jeff Forcier2014-02-141-0/+2
|\
| * Cut 1.11.4v1.11.41.11.4Jeff Forcier2014-02-143-2/+3
| * Merge branch '1.10' into 1.11Jeff Forcier2014-02-141-0/+1
| |\
| | * Cut 1.10.6v1.10.61.10.6Jeff Forcier2014-02-143-2/+3
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-02-141-1/+1
|\ \ \ | |/ /
| * | Catch & patch trimmingJeff Forcier2014-02-141-1/+1
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-02-143-11/+38
|\ \ \ | |/ /
| * | Tweak changelog languagefix-proxycommand-infinite-loop-252Jeff Forcier2014-02-141-5/+4
| * | Braino in changelog textJeff Forcier2014-02-131-1/+1
| * | Don't raise timeouts as ProxyCommand failures, thanks @mgedminJeff Forcier2014-02-131-0/+2
| * | Don't drop/lose data when our inner timeout goges off.Jeff Forcier2014-02-131-9/+8
| * | Slightly safer socket.error handlingJeff Forcier2014-02-131-1/+4
| * | I hate you sometimes, ReSTJeff Forcier2014-02-131-5/+6
| * | Preliminary changelog entry re #252Jeff Forcier2014-02-131-0/+5
| * | Changelog re #268Jeff Forcier2014-02-131-0/+2
| * | Fix NameError in error-handling caseMarius Gedminas2014-02-131-2/+2
| * | Potentially horrible attempt at manual subprocess-read timeoutsJeff Forcier2014-02-121-4/+24
| * | Nuke old merge mistake (or what looks like one anyway.)Jeff Forcier2014-02-121-4/+0
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-02-111-1/+1
|\ \ \ | |/ /
| * | Merge branch '1.10' into 1.11Jeff Forcier2014-02-111-1/+1
| |\ \ | | |/
| | * Bump to releases bugfixJeff Forcier2014-02-111-1/+1
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-02-117-24/+45
|\ \ \ | |/ /
| * | Merge branch '1.10' into 1.11Jeff Forcier2014-02-112-5/+5
| |\ \ | | |/
| | * Start reverting explicit-release stuff in favor of release-line specifiers on...Jeff Forcier2014-02-112-2/+2
| * | Merge branch '1.10' into 1.11Jeff Forcier2014-02-116-15/+36
| |\ \ | | |/
| | * Add coverage command as Invoke taskJeff Forcier2014-02-113-2/+7
| | * Clean up a list-comp (also fixes race condition)Jeff Forcier2014-02-111-1/+1
| | * Herp and a derpJeff Forcier2014-02-101-1/+1
| | * WhitespaceJeff Forcier2014-02-101-1/+1
| | * Future import for with: under py25Jeff Forcier2014-02-101-0/+2
| | * Replace incorrect import of generic test runner w/ custom taskJeff Forcier2014-02-101-3/+10
| | * Merge remote-tracking branch 'ewxrjk/issue34' into sftp-reordering-34Jeff Forcier2014-02-102-10/+14
| | |\
| | | * Fix issue 34 (SFTPFile prefetch assumes response order matches requests)Richard Kettlewell2011-08-292-10/+14
| | * | Changelog re #35Jeff Forcier2014-02-101-0/+3
| | * | Fix extra colon in changelogJeff Forcier2014-02-101-1/+1
* | | | Merge branch '1.11' into 1.12Jeff Forcier2014-02-033-4/+5
|\ \ \ \ | |/ / /
| * | | Merge branch '1.10' into 1.11Jeff Forcier2014-02-033-4/+5
| |\ \ \ | | |/ /
| | * | Simplify www page footer.Jeff Forcier2014-02-031-1/+1
| | * | Update to new Alabaster version for footer/extension stuffJeff Forcier2014-02-033-3/+4
* | | | Merge branch '1.11' into 1.12Jeff Forcier2014-01-301-3/+0
|\ \ \ \ | |/ / /
| * | | Merge branch '1.10' into 1.11Jeff Forcier2014-01-301-2/+0
| |\ \ \ | | |/ /
| | * | Don't preseed releases, ughJeff Forcier2014-01-301-1/+0
* | | | Merge branch '1.11' into 1.12Jeff Forcier2014-01-302-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '1.10' into 1.11Jeff Forcier2014-01-302-2/+2
| |\ \ \ | | |/ /
| | * | Fix broken link formatJeff Forcier2014-01-301-1/+1
| | * | Remove blog link for nowJeff Forcier2014-01-301-1/+1
* | | | Merge branch '1.11' into 1.12Jeff Forcier2014-01-301-178/+4
|\ \ \ \ | |/ / /
| * | | Merge branch '1.10' into 1.11Jeff Forcier2014-01-301-148/+4
| |\ \ \ | | |/ /
| | * | Nuke sphinx-changelogg'd materialJeff Forcier2014-01-301-92/+4