Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-12-14 | 2 | -5/+10 |
|\ | |||||
| * | Backport some minor formatting tweaks from 2.4.x | Jeff Forcier | 2018-12-14 | 2 | -5/+10 |
* | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-12-14 | 4 | -15/+15 |
|\ \ | |/ | |||||
| * | flake8 fixes after upgrading it to 3.6.0 | Jeff Forcier | 2018-12-14 | 4 | -15/+15 |
| * | Cut 2.0.92.0.9 | Jeff Forcier | 2018-09-18 | 1 | -1/+1 |
* | | Cut 2.1.62.1.6 | Jeff Forcier | 2018-09-18 | 1 | -1/+1 |
* | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-09-18 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix a Python 2.6 oops | Jeff Forcier | 2018-09-18 | 1 | -1/+1 |
* | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-09-18 | 1 | -5/+3 |
|\ \ | |/ | |||||
| * | Formatting | Jeff Forcier | 2018-09-18 | 1 | -5/+3 |
* | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-09-18 | 2 | -9/+50 |
|\ \ | |/ | |||||
| * | Fix and changelog re #1283 | Jeff Forcier | 2018-09-18 | 1 | -4/+32 |
| * | Fix a pseudo-bug re: responding to MSG_UNIMPLEMENTED w/ itself | Jeff Forcier | 2018-09-18 | 1 | -5/+18 |
* | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-09-18 | 3 | -22/+47 |
|\ \ | |/ | |||||
| * | Backport support for newer cryptography sign/verify APIs.crypto-1.5-agnostisicm | Jeff Forcier | 2018-09-18 | 3 | -22/+47 |
* | | Blacken 2.1 branch | Jeff Forcier | 2018-09-17 | 2 | -9/+8 |
* | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-09-17 | 41 | -1781/+2406 |
|\ \ | |/ | |||||
| * | Blacken 2.0 with black 18.6b4 | Jeff Forcier | 2018-09-17 | 41 | -1787/+2416 |
| * | Cut 2.0.82.0.8 | Jeff Forcier | 2018-03-12 | 1 | -1/+1 |
* | | Cut 2.1.52.1.5 | Jeff Forcier | 2018-03-12 | 1 | -1/+1 |
* | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-03-12 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | flake8 | Jeff Forcier | 2018-03-12 | 1 | -4/+4 |
| * | Fixes CVE-2018-7750 / #1175 | Jeff Forcier | 2018-03-12 | 2 | -2/+44 |
* | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-03-12 | 2 | -2/+44 |
|\ \ | |||||
| * | | Fixes CVE-2018-7750 / #XXX | Jeff Forcier | 2018-03-12 | 2 | -2/+44 |
| |/ | |||||
* | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2017-11-07 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | Rename an internal-only 'async' method kwarg for Python 3.7 compatibility. | Jeff Forcier | 2017-11-07 | 1 | -4/+4 |
* | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2017-10-10 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Typofix | Jeff Forcier | 2017-10-10 | 1 | -1/+1 |
* | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2017-09-26 | 2 | -3/+3 |
|\ \ | |/ | |||||
| * | sftp: fix BytesWarning: str() on a bytes instance | Michal Reznik | 2017-09-26 | 2 | -3/+3 |
| * | Cut 2.0.72.0.7 | Jeff Forcier | 2017-09-18 | 1 | -1/+1 |
* | | Cut 2.1.42.1.4 | Jeff Forcier | 2017-09-18 | 1 | -1/+1 |
* | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2017-09-12 | 4 | -79/+168 |
|\ \ | |/ | |||||
| * | Merge branch '2.0' into 1061-int | Jeff Forcier | 2017-09-12 | 2 | -7/+7 |
| |\ | |||||
| | * | Merge branch '2.0' into 1060-int | Jeff Forcier | 2017-09-12 | 1 | -1/+1 |
| | |\ | |||||
| | * | | Transport: fix the preferred KEX algorithms for gssapi-keyex | Anselm Kruis | 2017-08-03 | 1 | -6/+6 |
| * | | | Pep8 and Sphinx fixes. | Anselm Kruis | 2017-09-12 | 2 | -27/+29 |
| * | | | AuthHandler: handle local "gssapi-with-mic" errors in client mode | Anselm Kruis | 2017-08-04 | 1 | -9/+24 |
| * | | | AuthHandler: fix the server-mode "gssapi-with-mic" logic | Anselm Kruis | 2017-08-04 | 2 | -46/+107 |
| * | | | Added paramiko.GSS_EXCEPTIONS: exception types used by GSSAPI | Anselm Kruis | 2017-08-04 | 2 | -6/+17 |
| |/ / | |||||
* | | | Merge branch '2.0-gsskex-hostkeycheck-fix' into 2.1-gsskex-hostkeycheck-fix | Anselm Kruis | 2017-08-04 | 1 | -13/+12 |
|\ \ \ | | |/ | |/| | |||||
| * | | SSHClient: fix the host key test | Anselm Kruis | 2017-08-04 | 1 | -1/+1 |
| |/ | |||||
| * | Cut 2.0.62.0.6 | Jeff Forcier | 2017-06-09 | 1 | -1/+1 |
| * | Merge branch '2.0' into 976-int | Jeff Forcier | 2017-06-09 | 23 | -348/+259 |
| |\ | |||||
* | | | Cut 2.1.32.1.3 | Jeff Forcier | 2017-06-09 | 1 | -1/+1 |
* | | | Re-apply ResourceManager removal | Jeff Forcier | 2017-06-09 | 1 | -2/+0 |
* | | | Merge branch '2.1' into 910-int | Jeff Forcier | 2017-06-09 | 11 | -124/+28 |
|\ \ \ | |||||
| * \ \ | Merge branch '2.0' into 2.1 | Jeff Forcier | 2017-06-09 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Hand-port #984 to 2.0 | Jeff Forcier | 2017-06-09 | 1 | -1/+1 |