summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Cut 2.1.52.1.5Jeff Forcier2018-03-122-1/+2
* Merge branch '2.0' into 2.1Jeff Forcier2018-03-121-0/+1
|\
| * Cut 2.0.82.0.8Jeff Forcier2018-03-122-1/+2
* | Merge branch '2.0' into 2.1Jeff Forcier2018-03-121-4/+4
|\ \ | |/
| * flake8Jeff Forcier2018-03-121-4/+4
* | Merge branch '2.0' into 2.1Jeff Forcier2018-03-121-0/+4
|\ \ | |/
| * Screen off dev version of Python from test matrixJeff Forcier2018-03-121-0/+4
| * Fixes CVE-2018-7750 / #1175Jeff Forcier2018-03-122-2/+44
* | Merge branch '2.0' into 2.1Jeff Forcier2018-03-121-0/+5
|\ \ | |/
| * Changelog closes #1175Jeff Forcier2018-03-121-0/+5
* | Merge branch '2.0' into 2.1Jeff Forcier2018-03-120-0/+0
|\ \ | |/
| * Initial tests proving CVE-2018-7750 / #1175Jeff Forcier2018-03-121-2/+40
| * Allow overriding test client connect kwargs in Transport test suiteJeff Forcier2018-03-121-3/+10
* | Merge branch '2.0' into 2.1Jeff Forcier2018-03-123-7/+94
|\ \
| * | Fixes CVE-2018-7750 / #XXXJeff Forcier2018-03-122-2/+44
| * | Initial tests proving CVE-2018-7750 / #XXXJeff Forcier2018-03-121-2/+40
| * | Allow overriding test client connect kwargs in Transport test suiteJeff Forcier2018-03-121-3/+10
| |/
* | Merge branch '2.0' into 2.1Jeff Forcier2017-11-071-1/+0
|\ \ | |/
| * OK this is good now, with the setuptools pinJeff Forcier2017-11-071-1/+0
* | Merge branch '2.0' into 2.1Jeff Forcier2017-11-071-1/+2
|\ \ | |/
| * Well let's try latest setuptools, I guess.Jeff Forcier2017-11-071-1/+1
| * Despite odd output, pip 9.0.1 is installing; so how old's our setuptools?Jeff Forcier2017-11-071-1/+1
| * Uh...output claims pip somehow installing 7.x???Jeff Forcier2017-11-071-0/+1
* | Merge branch '2.0' into 2.1Jeff Forcier2017-11-071-0/+2
|\ \ | |/
| * JeezJeff Forcier2017-11-071-0/+2
* | Merge branch '2.0' into 2.1Jeff Forcier2017-11-071-3/+3
|\ \ | |/
| * Limit dev-requirements to python 2.6 compat versions.Jeff Forcier2017-11-071-3/+3
* | Merge branch '2.0' into 2.1Jeff Forcier2017-11-071-0/+1
|\ \ | |/
| * Add Python 3.7-dev to Travis matrix. Why not?Jeff Forcier2017-11-071-0/+1
* | Merge branch '2.0' into 2.1Jeff Forcier2017-11-072-4/+7
|\ \ | |/
| * Changelog re #1108Jeff Forcier2017-11-071-0/+3
| * 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-182-0/+4
|\ \ | |/
| * Include LICENSE in wheelsJeff Forcier2017-10-182-0/+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
* | Merge branch '2.0' into 2.1Jeff Forcier2017-09-181-3/+9
|\ \ | |/
| * Note that #945 is 1.18+Jeff Forcier2017-09-181-0/+5
| * Fix incorrect changelog branch stuff.Jeff Forcier2017-09-181-3/+4
* | 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