summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18MehJeff Forcier
2018-09-18Cut 2.3.3Jeff Forcier
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Cut 2.2.4Jeff Forcier
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Cut 2.1.6Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18Cut 2.0.9Jeff Forcier
2018-09-18Almost left the 1.17+ marker in the changelog.Jeff Forcier
Would not necessarily have caused issues but hey
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18Fix a Python 2.6 oopsJeff Forcier
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18FormattingJeff Forcier
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18Fix and changelog re #1283Jeff Forcier
2018-09-18Fix a pseudo-bug re: responding to MSG_UNIMPLEMENTED w/ itselfJeff Forcier
2018-09-18Pseudo-merge travis-CI changes re #1292 from 2.2 branchJeff Forcier
2018-09-18Pull in changelog re #1292Jeff Forcier
Rest of merge was resolved with '-s ours' to keep those changes back on the old branches only.
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18Merge branch 'crypto-1.5-agnostisicm' into 2.0Jeff Forcier
2018-09-18Missing verbose/color for 2.6/3.3 backported pytest setupJeff Forcier
Should be hitting all tests, including slow tests, by default still tho
2018-09-18Backport support for newer cryptography sign/verify APIs.Jeff Forcier
Implements #1292.
2018-09-18Try testing against different cryptography.io versionsJeff Forcier
2018-09-17Blacken, 2.3 editionJeff Forcier
2018-09-17s/test_path/_support/gJeff Forcier
2018-09-17Merge branch '2.2' into 2.3Jeff Forcier
2018-09-17Blacken, 2.2 editionJeff Forcier
2018-09-17Test-level fixes for pytest & friends, 2.2 editionJeff Forcier
2018-09-17Missed a spotJeff Forcier
2018-09-17Merge branch '2.1' into 2.2Jeff Forcier
Foregoes a handful of unblackened bits to make the merge easier; will blacken next anyways
2018-09-17One change overlooked by merge, as it's newJeff Forcier
2018-09-17Blacken 2.1 branchJeff Forcier
2018-09-17Merge branch '2.0' into 2.1Jeff Forcier
2018-09-17Throwing a bone to 2.0-2.3 python-2.6 supportJeff Forcier
2018-09-17Crummy workaround for 2.6/3.3 support.Jeff Forcier
2018-09-17pytest-xdist doesn't support Python 2.6Jeff Forcier
Just dropping it from Paramiko <2.4 entirely for the time being, it should only impact human users with control over their venv, and we don't use it on Travis either
2018-09-17Blacken 2.0 with black 18.6b4Jeff Forcier
2018-09-17Partial cherry pick of 57201d2de9cd4080480cfed2fe2572fa1c908acbJeff Forcier
Just so the first blackening of 2.0+ is already consistent with latest 2.4+...hopefully