summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Changelog entry re #731, re #611731-intJeff Forcier2016-04-281-0/+4
* Patch fix via @alex on #731, tests pass locally againJeff Forcier2016-04-281-1/+1
* Merge branch 'master' into 731-intJeff Forcier2016-04-284-23/+15
|\
| * Merge branch 'master' of github.com:paramiko/paramikoJeff Forcier2016-04-284-20/+15
| |\
| | * Merge pull request #733 from alex/from-encoded-pointJeff Forcier2016-04-284-20/+15
| | |\
| | | * Use a more recent cryptography and call a functionAlex Gaynor2016-04-274-20/+15
| | |/
* | | Formatting tweaks re #731Jeff Forcier2016-04-253-6/+7
* | | Merge branch 'master' into 731-intJeff Forcier2016-04-253-8/+54
|\ \ \ | |/ /
| * | Merge branch '1.17'Jeff Forcier2016-04-253-6/+49
| |\ \
| | * \ Merge branch '1.16' into 1.17Jeff Forcier2016-04-253-6/+49
| | |\ \
| | | * \ Merge branch '1.15' into 1.16Jeff Forcier2016-04-253-6/+49
| | | |\ \
| | | | * | Changelog closes #670Jeff Forcier2016-04-251-0/+6
| | | | * | Test & implementation for part 1 re: #670Jeff Forcier2016-04-252-6/+43
| * | | | | Merge branch '1.17'Jeff Forcier2016-04-251-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-251-2/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '1.15' into 1.16Jeff Forcier2016-04-251-2/+2
| | | |\ \ \ | | | | |/ /
| | | | * | Neglected to mark a bug 1.15+.Jeff Forcier2016-04-251-2/+2
| * | | | | Merge branch '1.17'Jeff Forcier2016-04-251-0/+3
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Reinstate 1.17.0 release lineJeff Forcier2016-04-251-0/+1
| | * | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-251-0/+2
| | |\ \ \ | | | |/ /
| | | * | Reinstate 1.16.1 release lineJeff Forcier2016-04-251-0/+1
| | | * | Merge branch '1.15' into 1.16Jeff Forcier2016-04-251-0/+1
| | | |\ \ | | | | |/
| | | | * Reinstate release line for 1.15.5Jeff Forcier2016-04-251-0/+1
* | | | | Add support for ECDSA key sizes 384 and 521 alongside the existing 256.Alex Orange2016-04-2511-42/+308
|/ / / /
* | | | Merge branch '1.17'Jeff Forcier2016-04-252-1/+22
|\ \ \ \ | |/ / /
| * | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-252-1/+22
| |\ \ \ | | |/ /
| | * | Reword/link changelog re #677, re #676Jeff Forcier2016-04-251-2/+5
| | * | Expand SFTPFile.prefetch docstring re #562, re #677Jeff Forcier2016-04-251-1/+13
| | * | paramiko.sftp_file.prefetch now backwards compatible[Stephen D. Van Hooser]2016-04-251-1/+1
| | * | paramiko.sftp_file.prefetch now backwards compatible[Stephen D. Van Hooser]2016-04-251-1/+1
| | * | paramiko.sftp_file.prefetch now backwards compatible[Stephen D. Van Hooser]2016-04-252-2/+8
* | | | Undo release lines pending #730Jeff Forcier2016-04-241-3/+0
|\ \ \ \ | |/ / /
| * | | Undo release lines pending #730Jeff Forcier2016-04-241-3/+0
| |\ \ \ | | |/ /
| | * | Undo release lines pending #730Jeff Forcier2016-04-241-2/+0
| | |\ \ | | | |/
| | | * Undo release line pending #730Jeff Forcier2016-04-241-1/+0
* | | | Merge branch '1.17'Jeff Forcier2016-04-241-0/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-241-0/+2
| |\ \ \ | | |/ /
| | * | Cut 1.16.1Jeff Forcier2016-04-242-1/+2
| | * | Merge branch '1.15' into 1.16Jeff Forcier2016-04-241-0/+1
| | |\ \ | | | |/
| | | * Cut 1.15.5Jeff Forcier2016-04-242-1/+2
* | | | Merge branch '1.17'Jeff Forcier2016-04-243-17/+28
|\ \ \ \ | |/ / /
| * | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-243-17/+28
| |\ \ \ | | |/ /
| | * | Merge branch '1.15' into 1.16Jeff Forcier2016-04-243-18/+29
| | |\ \ | | | |/
| | | * Changelog closes #578Jeff Forcier2016-04-241-0/+3
| | | * don't use has_key()Stephen C. Pope2016-04-241-1/+1
| | | * fix sftp stallsStephen C. Pope2016-04-242-18/+26
* | | | Merge branch '1.17'Jeff Forcier2016-04-243-3/+6
|\ \ \ \ | |/ / /
| * | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-242-2/+4
| |\ \ \ | | |/ /
| | * | Changelog re #716, closes #716Jeff Forcier2016-04-241-0/+2
| | * | Actually! we can just use the py3compat moduleJeff Forcier2016-04-241-5/+2