summaryrefslogtreecommitdiff
path: root/paramiko
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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.10' into 1.11Jeff Forcier2014-02-112-10/+16
|\
| * Clean up a list-comp (also fixes race condition)Jeff Forcier2014-02-111-1/+1
| * WhitespaceJeff Forcier2014-02-101-1/+1
| * Future import for with: under py25Jeff Forcier2014-02-101-0/+2
| * 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
* | | Merge branch '1.10' into 1.11Jeff Forcier2014-01-212-13/+28
|\ \ \ | |/ /
| * | Clean up thread ident import/exec a bit.Jeff Forcier2014-01-211-12/+7
| * | Try Py2.5 compatibility as last fallback for thread identity.Aarni Koskela2014-01-211-3/+5
| * | Support Py2.5 to Py3.4 for thread identity (thanks @lndbrg)Aarni Koskela2014-01-211-3/+16
| * | Fix agent auth on Windows/Python 2.5) (with thanks to @lndbrg)Aarni Koskela2014-01-212-5/+10
| * | Fix #193 (use RtlMoveMemory instead of msvcrt.memcpy)Aarni Koskela2014-01-211-6/+6
| * | Cut 1.10.5v1.10.51.10.5Jeff Forcier2014-01-081-1/+1
* | | Cut 1.11.3v1.11.31.11.3Jeff Forcier2014-01-081-1/+1
* | | Merge branch '1.10' into 1.11Jeff Forcier2014-01-081-2/+2
|\ \ \ | |/ /
| * | dittoNathan Scowcroft2014-01-081-1/+1
| * | Check correct stored hosts filename.Nathan Scowcroft2014-01-081-2/+2
* | | Merge branch '1.10' into 1.11Jeff Forcier2013-10-161-0/+1
|\ \ \ | |/ /
| * | Merge branch '1.9' into 1.10Jeff Forcier2013-10-161-0/+1
| |\ \
| | * \ Merge branch '1.8' into 1.9Jeff Forcier2013-10-161-0/+1
| | |\ \
| | | * | Reintroduce __version_info__ variableMike Gabriel2013-10-161-0/+1
* | | | | Merge branch '1.10' into 1.11v1.11.21.11.2Jeff Forcier2013-09-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Update version for 1.10.4v1.10.41.10.4Jeff Forcier2013-09-271-1/+1
* | | | | Merge branch '1.10' into 1.11Jeff Forcier2013-09-2735-35/+35
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '1.9' into 1.10Jeff Forcier2013-09-2735-35/+35
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '1.8' into 1.9Jeff Forcier2013-09-2735-35/+35
| | |\ \ \ | | | |/ /
| | | * | Fixed a typo in the license header of most filesJeff Forcier2013-09-2735-35/+35
* | | | | Merge branch '1.11' into 156-intJeff Forcier2013-09-277-41/+64
|\ \ \ \ \
| * \ \ \ \ Merge branch '1.10' into 1.11Jeff Forcier2013-09-271-15/+24
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix #179 - missing host variable in fqdn evaluationJeff Forcier2013-09-271-15/+24
| * | | | | Christ almighty I hate non-DRY versioningv1.11.11.11.1Jeff Forcier2013-09-201-1/+1
| * | | | | Merge branch '1.10' into 1.11Jeff Forcier2013-09-201-4/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '1.10' into 168-intJeff Forcier2013-09-202-9/+5
| | |\ \ \ \
| | * | | | | updated config to be compatible with multiple localforward and remoteforward ...Emre Yılmaz2013-05-211-4/+5
| * | | | | | Merge branch '1.10' into 1.11Jeff Forcier2013-09-201-8/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Apply slightly modified version of patch from #162Jeff Forcier2013-09-201-8/+4
| * | | | | | Version bump/dumb-fixv1.11.01.11.0Jeff Forcier2013-07-261-1/+1
| * | | | | | Merge branch '1.10'Jeff Forcier2013-07-261-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Version bumpv1.10.21.10.2Jeff Forcier2013-07-261-1/+1
| * | | | | | Add ML link to docs 'index'Jeff Forcier2013-06-281-0/+2
| | |/ / / / | |/| | | |
| * | | | | Merge branch '1.10'Jeff Forcier2013-05-051-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Flip bad known_hosts line to INFO from WARN re #153Jeff Forcier2013-05-051-2/+2
| | * | | | Warn on parse failure when reading known_hostsEthan Glasser-Camp2013-04-281-3/+8
| * | | | | Merge pull request #153 from glasserc/log_bad_hostkeysJeff Forcier2013-04-281-3/+8
| |\ \ \ \ \