Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cut 1.12.2v1.12.21.12.2 | Jeff Forcier | 2014-02-14 | 3 | -2/+3 |
| | |||||
* | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-02-14 | 1 | -0/+2 |
|\ | | | | | | | | | | | Conflicts: paramiko/__init__.py setup.py | ||||
| * | Cut 1.11.4v1.11.41.11.4 | Jeff Forcier | 2014-02-14 | 3 | -2/+3 |
| | | |||||
| * | Merge branch '1.10' into 1.11 | Jeff Forcier | 2014-02-14 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: paramiko/__init__.py setup.py sites/www/changelog.rst | ||||
| | * | Cut 1.10.6v1.10.61.10.6 | Jeff Forcier | 2014-02-14 | 3 | -2/+3 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-02-14 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Catch & patch trimming | Jeff Forcier | 2014-02-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-02-14 | 3 | -11/+38 |
|\ \ \ | |/ / | |||||
| * | | Tweak changelog languagefix-proxycommand-infinite-loop-252 | Jeff Forcier | 2014-02-14 | 1 | -5/+4 |
| | | | |||||
| * | | Braino in changelog text | Jeff Forcier | 2014-02-13 | 1 | -1/+1 |
| | | | |||||
| * | | Don't raise timeouts as ProxyCommand failures, thanks @mgedmin | Jeff Forcier | 2014-02-13 | 1 | -0/+2 |
| | | | |||||
| * | | Don't drop/lose data when our inner timeout goges off. | Jeff Forcier | 2014-02-13 | 1 | -9/+8 |
| | | | |||||
| * | | Slightly safer socket.error handling | Jeff Forcier | 2014-02-13 | 1 | -1/+4 |
| | | | |||||
| * | | I hate you sometimes, ReST | Jeff Forcier | 2014-02-13 | 1 | -5/+6 |
| | | | |||||
| * | | Preliminary changelog entry re #252 | Jeff Forcier | 2014-02-13 | 1 | -0/+5 |
| | | | |||||
| * | | Changelog re #268 | Jeff Forcier | 2014-02-13 | 1 | -0/+2 |
| | | | |||||
| * | | Fix NameError in error-handling case | Marius Gedminas | 2014-02-13 | 1 | -2/+2 |
| | | | | | | | | | | | | Fixes #268 | ||||
| * | | Potentially horrible attempt at manual subprocess-read timeouts | Jeff Forcier | 2014-02-12 | 1 | -4/+24 |
| | | | |||||
| * | | Nuke old merge mistake (or what looks like one anyway.) | Jeff Forcier | 2014-02-12 | 1 | -4/+0 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-02-11 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '1.10' into 1.11 | Jeff Forcier | 2014-02-11 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Bump to releases bugfix | Jeff Forcier | 2014-02-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-02-11 | 7 | -24/+45 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: sites/www/changelog.rst | ||||
| * | | Merge branch '1.10' into 1.11 | Jeff Forcier | 2014-02-11 | 2 | -5/+5 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: sites/www/changelog.rst | ||||
| | * | Start reverting explicit-release stuff in favor of release-line specifiers ↵ | Jeff Forcier | 2014-02-11 | 2 | -2/+2 |
| | | | | | | | | | | | | on bugs. | ||||
| * | | Merge branch '1.10' into 1.11 | Jeff Forcier | 2014-02-11 | 6 | -15/+36 |
| |\ \ | | |/ | |||||
| | * | Add coverage command as Invoke task | Jeff Forcier | 2014-02-11 | 3 | -2/+7 |
| | | | |||||
| | * | Clean up a list-comp (also fixes race condition) | Jeff Forcier | 2014-02-11 | 1 | -1/+1 |
| | | | |||||
| | * | Herp and a derp | Jeff Forcier | 2014-02-10 | 1 | -1/+1 |
| | | | |||||
| | * | Whitespace | Jeff Forcier | 2014-02-10 | 1 | -1/+1 |
| | | | |||||
| | * | Future import for with: under py25 | Jeff Forcier | 2014-02-10 | 1 | -0/+2 |
| | | | |||||
| | * | Replace incorrect import of generic test runner w/ custom task | Jeff Forcier | 2014-02-10 | 1 | -3/+10 |
| | | | |||||
| | * | Merge remote-tracking branch 'ewxrjk/issue34' into sftp-reordering-34 | Jeff Forcier | 2014-02-10 | 2 | -10/+14 |
| | |\ | |||||
| | | * | Fix issue 34 (SFTPFile prefetch assumes response order matches requests) | Richard Kettlewell | 2011-08-29 | 2 | -10/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SFTPFile._async_response gets a new 'num' parameter giving the request number. This can be matched up with the return value of SFTPClient._async_request() to retrieve data specific to that request. The prefetch queue SFTPFile._prefetch_reads is replaced with the dict _prefetch_extents, which maps request numbers to (offset,length) tuples. A lock is used to exclude the case where a response arrives in _async_response before _prefetch_thread has updated it. | ||||
| | * | | Changelog re #35 | Jeff Forcier | 2014-02-10 | 1 | -0/+3 |
| | | | | |||||
| | * | | Fix extra colon in changelog | Jeff Forcier | 2014-02-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-02-03 | 3 | -4/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '1.10' into 1.11 | Jeff Forcier | 2014-02-03 | 3 | -4/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Simplify www page footer. | Jeff Forcier | 2014-02-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Robey copyright remains in source code but this site is brand new & the footer was real noisy. Eh. | ||||
| | * | | Update to new Alabaster version for footer/extension stuff | Jeff Forcier | 2014-02-03 | 3 | -3/+4 |
| | | | | |||||
* | | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-01-30 | 1 | -3/+0 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: sites/www/changelog.rst | ||||
| * | | | Merge branch '1.10' into 1.11 | Jeff Forcier | 2014-01-30 | 1 | -2/+0 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: sites/www/changelog.rst | ||||
| | * | | Don't preseed releases, ugh | Jeff Forcier | 2014-01-30 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-01-30 | 2 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '1.10' into 1.11 | Jeff Forcier | 2014-01-30 | 2 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix broken link format | Jeff Forcier | 2014-01-30 | 1 | -1/+1 |
| | | | | |||||
| | * | | Remove blog link for now | Jeff Forcier | 2014-01-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-01-30 | 1 | -178/+4 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: NEWS | ||||
| * | | | Merge branch '1.10' into 1.11 | Jeff Forcier | 2014-01-30 | 1 | -148/+4 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | Conflicts: NEWS sites/www/changelog.rst | ||||
| | * | | Nuke sphinx-changelogg'd material | Jeff Forcier | 2014-01-30 | 1 | -92/+4 |
| | | | |