summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Cut 2.5.12.5.1Jeff Forcier2019-06-232-1/+2
* Merge branch '2.4' into 2.5Jeff Forcier2019-06-231-0/+1
|\
| * Cut 2.4.32.4.3Jeff Forcier2019-06-232-1/+2
* | Merge branch '2.4' into 2.5Jeff Forcier2019-06-211-0/+8
|\ \ | |/
| * Merge branch '2.3' into 2.4Jeff Forcier2019-06-211-0/+8
| |\
| | * Merge branch '2.2' into 2.3Jeff Forcier2019-06-211-0/+8
| | |\
| | | * GSSAPI related kwargs were never docstring-documented -_-Jeff Forcier2019-06-211-0/+8
* | | | Merge branch '2.4' into 2.5Jeff Forcier2019-06-211-2/+6
|\ \ \ \ | |/ / /
| * | | Merge branch '2.3' into 2.4Jeff Forcier2019-06-211-2/+6
| |\ \ \ | | |/ /
| | * | Merge branch '2.2' into 2.3Jeff Forcier2019-06-211-2/+6
| | |\ \ | | | |/
| | | * BlackenJeff Forcier2019-06-211-2/+6
* | | | Merge branch '2.4' into 2.5Jeff Forcier2019-06-215-3/+33
|\ \ \ \ | |/ / /
| * | | Merge branch '2.3' into 2.4Jeff Forcier2019-06-215-3/+33
| |\ \ \ | | |/ /
| | * | Merge branch '2.2' into 2.3Jeff Forcier2019-06-215-3/+33
| | |\ \ | | | |/
| | | * Add new keys and tests proving #1306Jeff Forcier2019-06-213-0/+23
| | | * Changelog re #1306Jeff Forcier2019-06-211-0/+5
| | | * fix ed25519 ssh key unpad() when padding not present (not needed)Pierce Lopez2019-06-211-3/+5
* | | | Merge branch '2.4' into 2.5Jeff Forcier2019-06-161-0/+1
|\ \ \ \ | |/ / /
| * | | Cannot easily filter CryptographyDeprecationWarning on OLDEST_CRYPTO=1.5Jeff Forcier2019-06-161-3/+0
* | | | Merge branch '2.4' into 2.5Jeff Forcier2019-06-141-3/+2
|\ \ \ \ | |/ / /
| * | | Backported flake8 fixJeff Forcier2019-06-141-3/+2
* | | | Merge branch '2.4' into 2.5Jeff Forcier2019-06-141-0/+6
|\ \ \ \ | |/ / /
| * | | Basic tests proving Client.exec_command returns ChannelFile instancesJeff Forcier2019-06-141-0/+6
* | | | Merge branch '2.4' into 2.5Jeff Forcier2019-06-141-3/+0
|\ \ \ \ | |/ / /
| * | | Merge branch '2.3' into 2.4Jeff Forcier2019-06-141-3/+0
| |\ \ \ | | |/ /
| | * | Merge branch '2.2' into 2.3Jeff Forcier2019-06-141-3/+0
| | |\ \ | | | |/
| | | * Merge branch '2.1' into 2.2Jeff Forcier2019-06-141-3/+0
| | | |\
| | | | * Merge branch '2.0' into 2.1Jeff Forcier2019-06-141-3/+0
| | | | |\
| | | | | * Seriously?Jeff Forcier2019-06-141-3/+0
* | | | | | Merge branch '2.4' into 2.5Jeff Forcier2019-06-142-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | I don't understand why this was ever here, seems extraneousJeff Forcier2019-06-141-3/+0
| * | | | | Ignore CryptographyDeprecationWarning in tests on 2.4 branchJeff Forcier2019-06-141-0/+4
| * | | | | Add some basic tests for Channel(Stderr)FileJeff Forcier2019-06-142-1/+43
* | | | | | Merge branch '2.4' into 2.5Jeff Forcier2019-06-141-3/+0
|\ \ \ \ \ \
| * | | | | | I don't understand why this was ever here, seems extraneousJeff Forcier2019-06-141-3/+0
* | | | | | | Remove CryptographyDeprecationWarning filter on 2.5+Jeff Forcier2019-06-141-3/+0
* | | | | | | Merge branch '2.4' into 2.5Jeff Forcier2019-06-142-0/+48
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Ignore CryptographyDeprecationWarning in tests on 2.4 branchJeff Forcier2019-06-141-0/+4
| * | | | | | Add some basic tests for Channel(Stderr)FileJeff Forcier2019-06-141-0/+42
| |/ / / / /
| * | | | | Filter ABCs DeprecationWarning from pkg_resources' vendored pyparsingJeff Forcier2019-06-141-0/+2
* | | | | | Merge branch '2.4' into 2.5Jeff Forcier2019-06-143-16/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Latest pytest-xdist I guess, I don't use it thoJeff Forcier2019-06-141-1/+1
| * | | | | Merge branch '2.3' into 2.4Jeff Forcier2019-06-143-15/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '2.2' into 2.3Jeff Forcier2019-06-143-15/+9
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '2.1' into 2.2Jeff Forcier2019-06-143-15/+9
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '2.0' into 2.1Jeff Forcier2019-06-143-15/+9
| | | | |\ \ | | | | | |/
| | | | | * Update to modern pytest(-relaxed)Jeff Forcier2019-06-143-15/+9
* | | | | | Cut 2.5.02.5.0Jeff Forcier2019-06-092-1/+2
* | | | | | Try hiding 1291/1292 from feature releases.Jeff Forcier2019-06-091-5/+6
* | | | | | Changelog closes #1233, closes #1229, closes #1332Jeff Forcier2019-06-091-0/+5