summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Cut 2.1.42.1.4Jeff Forcier2017-09-182-1/+2
* Merge branch '2.0' into 2.1Jeff Forcier2017-09-182-1/+2
|\
| * Need new twine for newer pypiJeff Forcier2017-09-181-1/+1
| * Cut 2.0.72.0.7Jeff Forcier2017-09-182-1/+2
* | Merge branch '2.0' into 2.1Jeff Forcier2017-09-181-0/+1
|\ \ | |/
| * Merge branch '2.0' of github.com:paramiko/paramiko into 2.0Jeff Forcier2017-09-1824-151/+513
| |\
| * | Migrate changelog release entry from 1.18Jeff Forcier2017-09-181-0/+1
* | | Merge branch '2.0' into 2.1Jeff Forcier2017-09-127-90/+221
|\ \ \ | | |/ | |/|
| * | Changelog re #1061Jeff Forcier2017-09-121-0/+5
| * | Merge branch '2.0' into 1061-intJeff Forcier2017-09-125-11/+81
| |\ \
| | * | demo_simple: gss_auth and gss_kex are independent of each other.Anselm Kruis2017-09-121-4/+7
| | * | Changelog re #1060Jeff Forcier2017-09-121-0/+3
| | * | Merge branch '2.0' into 1060-intJeff Forcier2017-09-123-1/+65
| | |\ \
| | * | | Transport: fix the preferred KEX algorithms for gssapi-keyexAnselm Kruis2017-08-031-6/+6
| * | | | Pep8 and Sphinx fixes.Anselm Kruis2017-09-122-27/+29
| * | | | AuthHandler: handle local "gssapi-with-mic" errors in client modeAnselm Kruis2017-08-041-9/+24
| * | | | AuthHandler: fix the server-mode "gssapi-with-mic" logicAnselm Kruis2017-08-043-53/+145
| * | | | Added paramiko.GSS_EXCEPTIONS: exception types used by GSSAPIAnselm Kruis2017-08-042-6/+17
| |/ / /
* | | | Merge branch '2.0' into 2.1Jeff Forcier2017-09-121-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Master changelog entry re: #1056 #1057 #1058 #1059Jeff Forcier2017-09-121-0/+3
* | | | Merge branch '2.0-gsskex-hostkeycheck-fix' into 2.1-gsskex-hostkeycheck-fixAnselm Kruis2017-08-042-13/+73
|\ \ \ \ | |/ / /
| * | | SSHClient: fix the host key testAnselm Kruis2017-08-042-1/+62
| |/ /
* | | Merge branch '2.0' into 2.1Jeff Forcier2017-06-151-1/+1
|\ \ \ | |/ /
| * | Merge pull request #997 from ploxiln/travis_pypy_updateJeff Forcier2017-06-151-1/+1
| |\ \
| | * | travis-ci: update pypy test run to use pypy-5.6.0Pierce Lopez2017-06-141-1/+1
| |/ /
* | | Merge branch '2.0' into 2.1Jeff Forcier2017-06-121-0/+1
|\ \ \ | |/ /
| * | Add Python 3.6 to classifiersFelix Yan2017-06-121-0/+1
* | | Cut 2.1.32.1.3Jeff Forcier2017-06-092-1/+2
* | | Merge branch '2.0' into 2.1Jeff Forcier2017-06-091-0/+3
|\ \ \ | |/ /
| * | Cut 2.0.62.0.6Jeff Forcier2017-06-092-1/+2
| * | Copy 1.x releases to 2.x changelogJeff Forcier2017-06-091-0/+2
* | | Clarification language re #865 changelogJeff Forcier2017-06-091-1/+1
* | | Re-apply ResourceManager removalJeff Forcier2017-06-091-2/+0
* | | Merge branch '2.1' into 910-intJeff Forcier2017-06-0920-152/+243
|\ \ \
| * \ \ Merge branch '2.0' into 2.1Jeff Forcier2017-06-091-0/+2
| |\ \ \ | | |/ /
| | * | Port #906 changelog to 2.0 re #976Jeff Forcier2017-06-091-0/+2
| | * | Merge branch '2.0' into 976-intJeff Forcier2017-06-0933-386/+547
| | |\ \
| * | \ \ Merge branch '2.0' into 2.1Jeff Forcier2017-06-092-1/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Hand-port #984 to 2.0Jeff Forcier2017-06-092-1/+4
| * | | | Merge branch '2.0' into 2.1Jeff Forcier2017-06-096-26/+8
| |\ \ \ \
| | * \ \ \ Merge branch '2.0' into 976-intJeff Forcier2017-06-0933-385/+543
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |
| | * | | cleanup unused and star importsPierce Lopez2017-06-013-3/+2
| | * | | can depend on collections.MutableMapping being availablePierce Lopez2017-06-011-6/+1
| | * | | all supported versions of python2 have cStringIOPierce Lopez2017-06-011-9/+2
| | * | | transport: remove compat for old python lacking sock.settimeout()Pierce Lopez2017-06-011-8/+3
| * | | | Merge branch '2.0' into 2.1Jeff Forcier2017-06-099-31/+207
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Port #971 changelog from 1.x to 2.xJeff Forcier2017-06-091-0/+5
| | * | | Flake8/etc tweaks re #971 in 2.xJeff Forcier2017-06-093-7/+3
| | * | | Tweak comments as suggested in reviewMartin Packman2017-06-093-4/+6
| | * | | Allow any buffer type to be written to SFTPFileMartin Packman2017-06-092-4/+31