summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * Cut 2.0.62.0.6Jeff Forcier2017-06-092-1/+2
| | * Copy 1.x releases to 2.x changelogJeff Forcier2017-06-091-0/+2
* | | Merge branch '2.1'Jeff Forcier2017-06-091-1/+1
|\ \ \ | |/ /
| * | Clarification language re #865 changelogJeff Forcier2017-06-091-1/+1
* | | Merge branch '2.1'Jeff Forcier2017-06-094-23/+88
|\ \ \ | |/ /
| * | Re-apply ResourceManager removalJeff Forcier2017-06-091-2/+0
| * | Merge branch '2.1' into 910-intJeff Forcier2017-06-0920-152/+243
| |\ \
| * | | changelog: update for #865 / #910Pierce Lopez2017-06-071-0/+4
| * | | SSHClient: adjust Transport preferred host key types if known hostPierce Lopez2017-06-071-21/+27
| * | | Transport: log agreed host key typePierce Lopez2017-06-071-0/+3
| * | | tests for host key negotiation when there are multiplePierce Lopez2017-06-071-4/+56
* | | | Merge branch '2.1'Jeff Forcier2017-06-091-0/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '2.0' into 2.1Jeff Forcier2017-06-091-0/+2
| |\ \ \ | | | |/ | | |/|
| | * | Port #906 changelog to 2.0 re #976Jeff Forcier2017-06-091-0/+2
| | * | Merge branch '2.0' into 976-intJeff Forcier2017-06-0933-386/+547
| | |\ \
* | | \ \ Merge branch 'master' into 984-intJeff Forcier2017-06-0930-182/+468
|\ \ \ \ \
| * \ \ \ \ Merge branch '2.1'Jeff Forcier2017-06-092-1/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '2.0' into 2.1Jeff Forcier2017-06-092-1/+4
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Hand-port #984 to 2.0Jeff Forcier2017-06-092-1/+4
| * | | | | Merge branch '2.1'Jeff Forcier2017-06-096-26/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '2.0' into 2.1Jeff Forcier2017-06-096-26/+8
| | |\ \ \ \
| | | * \ \ \ Merge branch '2.0' into 976-intJeff Forcier2017-06-0933-385/+543
| | | |\ \ \ \ | | | | |/ / / | | | | | / / | | | | |/ / | | | |/| |
| | | * | | cleanup unused and star importsPierce Lopez2017-06-013-3/+2
| | | * | | can depend on collections.MutableMapping being availablePierce Lopez2017-06-011-6/+1
| | | * | | all supported versions of python2 have cStringIOPierce Lopez2017-06-011-9/+2
| | | * | | transport: remove compat for old python lacking sock.settimeout()Pierce Lopez2017-06-011-8/+3
| * | | | | Merge branch '2.1'Jeff Forcier2017-06-098-30/+206
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '2.0' into 2.1Jeff Forcier2017-06-099-31/+207
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Port #971 changelog from 1.x to 2.xJeff Forcier2017-06-091-0/+5
| | | * | | Flake8/etc tweaks re #971 in 2.xJeff Forcier2017-06-093-7/+3
| | | * | | Tweak comments as suggested in reviewMartin Packman2017-06-093-4/+6
| | | * | | Allow any buffer type to be written to SFTPFileMartin Packman2017-06-092-4/+31
| | | * | | Allow any buffer type to be sent to ChannelMartin Packman2017-06-092-9/+79
| | | * | | Import from py3compat directly in test_clientMartin Packman2017-06-091-1/+1
| | | * | | Allow any buffer type to written to BufferedFileMartin Packman2017-06-092-12/+52
| | | * | | Add new skipUnlessBuiltin function for testingMartin Packman2017-06-091-0/+36
| * | | | | More changelog flimflammeryJeff Forcier2017-06-091-3/+3
| * | | | | Merge branch '2.1'Jeff Forcier2017-06-091-9/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '2.0' into 2.1Jeff Forcier2017-06-091-9/+9
| | |\ \ \ \ | | | |/ / /
| | | * | | Unify 1.x and 2.x changelog entries.Jeff Forcier2017-06-091-9/+9
| * | | | | Merge branch '2.1'Jeff Forcier2017-06-094-4/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '2.0' into 2.1Jeff Forcier2017-06-094-4/+8
| | |\ \ \ \ | | | |/ / /
| | | * | | Changelog re #956Jeff Forcier2017-06-091-0/+3
| | | * | | Replace coveralls with codecov, comments disabledNikolai R Kristiansen2017-06-093-4/+5
| * | | | | Merge branch '2.1'Jeff Forcier2017-06-095-87/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '2.0' into 2.1Jeff Forcier2017-06-095-87/+9
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| |
| | | * | Merge branch '2.0' into 952-intJeff Forcier2017-06-0925-262/+318
| | | |\ \
| | | * | | re-enable client cleanup test for python3Pierce Lopez2017-06-021-8/+5
| | | * | | update changelog with fix for #949Pierce Lopez2017-06-021-0/+4
| | | * | | remove back-reference from Transport to SSHClientPierce Lopez2017-06-022-6/+0