summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'alex/switch-to-cryptography' into 394-int394-intJeff Forcier2016-04-241-1/+1
|\
| * crypto our cryptoAlex Gaynor2016-04-241-1/+1
| * Merge branch 'master' into switch-to-cryptographyAlex Gaynor2016-04-2412-51/+122
| |\
* | \ Merge branch 'master' into 394-intJeff Forcier2016-04-245-23/+34
|\ \ \ | | |/ | |/|
| * | Merge branch '1.16'Jeff Forcier2016-04-241-0/+3
| |\ \
| | * \ Merge branch '1.15' into 1.16Jeff Forcier2016-04-241-0/+3
| | |\ \
| | | * | Enabling caching of pip downloads and wheelsAlex Gaynor2016-04-241-0/+3
| * | | | Merge branch '1.16'Jeff Forcier2016-04-242-17/+10
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '1.15' into 1.16Jeff Forcier2016-04-242-17/+10
| | |\ \ \ | | | |/ /
| | | * | Changelog closes #729Jeff Forcier2016-04-241-0/+3
| | | * | Simplify setup.py by always relying on setuptoolsAlex Gaynor2016-04-241-17/+7
| * | | | Merge branch '1.16'Jeff Forcier2016-04-241-4/+17
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '1.15' into 1.16Jeff Forcier2016-04-241-4/+17
| | |\ \ \ | | | |/ /
| | | * | Attempt clarification of `set_missing_host_key_policy` param.Jeff Forcier2016-04-241-4/+17
| * | | | Changelog re #649Jeff Forcier2016-04-241-0/+3
| * | | | Merge pull request #649 from damz/pr/moduliJeff Forcier2016-04-241-2/+2
| |\ \ \ \
| | * | | | primes: min and max should be inclusive.Damien Tournoud2015-12-231-2/+2
* | | | | | Merge branch 'master' into 394-intJeff Forcier2016-04-248-26/+84
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '1.16'Jeff Forcier2016-04-241-2/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Be clearerJeff Forcier2016-04-241-2/+3
| * | | | | Merge branch '1.16'Jeff Forcier2016-04-241-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Apparently a whole lot of people noticed that tiny python 3 issueJeff Forcier2016-04-241-1/+1
| * | | | | Merge branch '1.16'Jeff Forcier2016-04-241-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Oh hey this also fixes the only other open 1.16.1 ticket yeyJeff Forcier2016-04-241-1/+1
| * | | | | Merge branch '1.16'Jeff Forcier2016-04-244-3/+47
| |\ \ \ \ \ | | |/ / / /
| | * | | | Changelog re #617, #679, #678, #685.Jeff Forcier2016-04-241-0/+5
| | * | | | Python 2.6 fix re: assertInJeff Forcier2016-04-241-3/+4
| | * | | | Support pickling hypothetical subclassesMarius Gedminas2016-04-241-1/+1
| | * | | | Improve NoValidConnectionsError formattingMarius Gedminas2016-04-242-3/+21
| | * | | | Fix tests on Python 3.xMarius Gedminas2016-04-241-1/+1
| | * | | | Make NoValidConnectionsError picklable correctlyMarius Gedminas2016-04-243-1/+21
| * | | | | Merge branch '1.16'Jeff Forcier2016-04-242-3/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Changelog re #619, re #613Jeff Forcier2016-04-241-0/+2
| | * | | | Merge branch '1.16' into 619-intJeff Forcier2016-04-2481-1170/+4591
| | |\ \ \ \
| | * | | | | Update per jaraco.windows 3.4.1Jason R. Coombs2015-11-101-4/+4
| * | | | | | Merge branch '1.16'Jeff Forcier2016-04-242-0/+8
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch '1.15' into 1.16Jeff Forcier2016-04-242-0/+8
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Expose some effectively-public Channel attributes in API docs.Jeff Forcier2016-04-242-0/+8
| * | | | | | Merge branch '1.16'Jeff Forcier2016-04-233-20/+23
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '1.15' into 1.16Jeff Forcier2016-04-233-20/+23
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | MehJeff Forcier2016-04-231-1/+1
| | | * | | | Refactor because ugh.Jeff Forcier2016-04-231-19/+18
| | | * | | | Update existing test to prove #632Jeff Forcier2016-04-231-2/+2
| | | * | | | Changelog closes #632Jeff Forcier2016-04-231-0/+3
| | | * | | | Update sftp_client.pyAbhinav2016-04-231-2/+2
| * | | | | | Merge branch '1.16'Jeff Forcier2016-04-231-2/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '1.15' into 1.16Jeff Forcier2016-04-231-2/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix broken changelog doc linkJeff Forcier2016-04-231-2/+3
* | | | | | | s/CFFI/libffi/ as per @reaperhulkJeff Forcier2016-04-231-2/+2
* | | | | | | Fix broken changelog doc linkJeff Forcier2016-04-231-2/+3