summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* flake8Jeff Forcier2019-06-211-1/+2
* Merge branch 'master' into 1311-intJeff Forcier2019-06-2130-340/+818
|\
| * Merge branch '2.5'Jeff Forcier2019-06-161-0/+1
| |\
| | * 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.5'Jeff Forcier2019-06-140-0/+0
| |\ \ \ | | |/ /
| | * | Merge branch '2.4' into 2.5Jeff Forcier2019-06-141-3/+2
| | |\ \ | | | |/
| | | * Backported flake8 fixJeff Forcier2019-06-141-3/+2
| * | | Add docstrings so Channel(Stderr|Stdin)File appear in SphinxJeff Forcier2019-06-142-2/+16
| * | | Whoops this was technically incorrectJeff Forcier2019-06-141-1/+1
| * | | flake8, blackenJeff Forcier2019-06-142-3/+8
| * | | Implement #322 - new ChannelFile subclass for stdin that calls shutdown_write...Jeff Forcier2019-06-146-9/+61
| * | | Fix old docstring re: returned object classJeff Forcier2019-06-141-1/+2
| * | | More pytest version tweaksJeff Forcier2019-06-141-2/+1
| |/ /
| * | 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
| * | | | | | Tighten up some logic/flow in the new ETM packet codeJeff Forcier2019-06-091-23/+12
| * | | | | | Fix copypasta'd copyrightJeff Forcier2019-06-091-1/+1
| * | | | | | flake8/blackenJeff Forcier2019-06-092-18/+6
| * | | | | | Merge branch 'master' into 1233-intJeff Forcier2019-06-0955-759/+1234
| |\ \ \ \ \ \
| | * | | | | | Travis' PyPy variants' local SSL doesn't support Curve25519Jeff Forcier2019-06-081-12/+14
| | * | | | | | Merge branch '2.4'Jeff Forcier2019-06-0817-146/+140
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Some additional badly named tests that I guess weren't in master?Jeff Forcier2019-06-084-23/+23