summaryrefslogtreecommitdiff
path: root/paramiko
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.0' into 2.1Jeff Forcier2018-12-142-5/+10
|\
| * Backport some minor formatting tweaks from 2.4.xJeff Forcier2018-12-142-5/+10
* | Merge branch '2.0' into 2.1Jeff Forcier2018-12-144-15/+15
|\ \ | |/
| * flake8 fixes after upgrading it to 3.6.0Jeff Forcier2018-12-144-15/+15
| * Cut 2.0.92.0.9Jeff Forcier2018-09-181-1/+1
* | Cut 2.1.62.1.6Jeff Forcier2018-09-181-1/+1
* | Merge branch '2.0' into 2.1Jeff Forcier2018-09-181-1/+1
|\ \ | |/
| * Fix a Python 2.6 oopsJeff Forcier2018-09-181-1/+1
* | Merge branch '2.0' into 2.1Jeff Forcier2018-09-181-5/+3
|\ \ | |/
| * FormattingJeff Forcier2018-09-181-5/+3
* | Merge branch '2.0' into 2.1Jeff Forcier2018-09-182-9/+50
|\ \ | |/
| * Fix and changelog re #1283Jeff Forcier2018-09-181-4/+32
| * Fix a pseudo-bug re: responding to MSG_UNIMPLEMENTED w/ itselfJeff Forcier2018-09-181-5/+18
* | Merge branch '2.0' into 2.1Jeff Forcier2018-09-183-22/+47
|\ \ | |/
| * Backport support for newer cryptography sign/verify APIs.crypto-1.5-agnostisicmJeff Forcier2018-09-183-22/+47
* | Blacken 2.1 branchJeff Forcier2018-09-172-9/+8
* | Merge branch '2.0' into 2.1Jeff Forcier2018-09-1741-1781/+2406
|\ \ | |/
| * Blacken 2.0 with black 18.6b4Jeff Forcier2018-09-1741-1787/+2416
| * Cut 2.0.82.0.8Jeff Forcier2018-03-121-1/+1
* | Cut 2.1.52.1.5Jeff Forcier2018-03-121-1/+1
* | Merge branch '2.0' into 2.1Jeff Forcier2018-03-121-4/+4
|\ \ | |/
| * flake8Jeff Forcier2018-03-121-4/+4
| * Fixes CVE-2018-7750 / #1175Jeff Forcier2018-03-122-2/+44
* | Merge branch '2.0' into 2.1Jeff Forcier2018-03-122-2/+44
|\ \
| * | Fixes CVE-2018-7750 / #XXXJeff Forcier2018-03-122-2/+44
| |/
* | Merge branch '2.0' into 2.1Jeff Forcier2017-11-071-4/+4
|\ \ | |/
| * Rename an internal-only 'async' method kwarg for Python 3.7 compatibility.Jeff Forcier2017-11-071-4/+4
* | Merge branch '2.0' into 2.1Jeff Forcier2017-10-101-1/+1
|\ \ | |/
| * TypofixJeff Forcier2017-10-101-1/+1
* | Merge branch '2.0' into 2.1Jeff Forcier2017-09-262-3/+3
|\ \ | |/
| * sftp: fix BytesWarning: str() on a bytes instanceMichal Reznik2017-09-262-3/+3
| * Cut 2.0.72.0.7Jeff Forcier2017-09-181-1/+1
* | Cut 2.1.42.1.4Jeff Forcier2017-09-181-1/+1
* | Merge branch '2.0' into 2.1Jeff Forcier2017-09-124-79/+168
|\ \ | |/
| * Merge branch '2.0' into 1061-intJeff Forcier2017-09-122-7/+7
| |\
| | * Merge branch '2.0' into 1060-intJeff Forcier2017-09-121-1/+1
| | |\
| | * | 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-042-46/+107
| * | | Added paramiko.GSS_EXCEPTIONS: exception types used by GSSAPIAnselm Kruis2017-08-042-6/+17
| |/ /
* | | Merge branch '2.0-gsskex-hostkeycheck-fix' into 2.1-gsskex-hostkeycheck-fixAnselm Kruis2017-08-041-13/+12
|\ \ \ | | |/ | |/|
| * | SSHClient: fix the host key testAnselm Kruis2017-08-041-1/+1
| |/
| * Cut 2.0.62.0.6Jeff Forcier2017-06-091-1/+1
| * Merge branch '2.0' into 976-intJeff Forcier2017-06-0923-348/+259
| |\
* | | Cut 2.1.32.1.3Jeff Forcier2017-06-091-1/+1
* | | Re-apply ResourceManager removalJeff Forcier2017-06-091-2/+0
* | | Merge branch '2.1' into 910-intJeff Forcier2017-06-0911-124/+28
|\ \ \
| * \ \ Merge branch '2.0' into 2.1Jeff Forcier2017-06-091-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Hand-port #984 to 2.0Jeff Forcier2017-06-091-1/+1