Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'alex/switch-to-cryptography' into 394-int394-int | Jeff Forcier | 2016-04-24 | 1 | -1/+1 |
|\ | |||||
| * | crypto our crypto | Alex Gaynor | 2016-04-24 | 1 | -1/+1 |
| * | Merge branch 'master' into switch-to-cryptography | Alex Gaynor | 2016-04-24 | 12 | -51/+122 |
| |\ | |||||
* | \ | Merge branch 'master' into 394-int | Jeff Forcier | 2016-04-24 | 5 | -23/+34 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch '1.16' | Jeff Forcier | 2016-04-24 | 1 | -0/+3 |
| |\ \ | |||||
| | * \ | Merge branch '1.15' into 1.16 | Jeff Forcier | 2016-04-24 | 1 | -0/+3 |
| | |\ \ | |||||
| | | * | | Enabling caching of pip downloads and wheels | Alex Gaynor | 2016-04-24 | 1 | -0/+3 |
| * | | | | Merge branch '1.16' | Jeff Forcier | 2016-04-24 | 2 | -17/+10 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '1.15' into 1.16 | Jeff Forcier | 2016-04-24 | 2 | -17/+10 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Changelog closes #729 | Jeff Forcier | 2016-04-24 | 1 | -0/+3 |
| | | * | | Simplify setup.py by always relying on setuptools | Alex Gaynor | 2016-04-24 | 1 | -17/+7 |
| * | | | | Merge branch '1.16' | Jeff Forcier | 2016-04-24 | 1 | -4/+17 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '1.15' into 1.16 | Jeff Forcier | 2016-04-24 | 1 | -4/+17 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Attempt clarification of `set_missing_host_key_policy` param. | Jeff Forcier | 2016-04-24 | 1 | -4/+17 |
| * | | | | Changelog re #649 | Jeff Forcier | 2016-04-24 | 1 | -0/+3 |
| * | | | | Merge pull request #649 from damz/pr/moduli | Jeff Forcier | 2016-04-24 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | primes: min and max should be inclusive. | Damien Tournoud | 2015-12-23 | 1 | -2/+2 |
* | | | | | | Merge branch 'master' into 394-int | Jeff Forcier | 2016-04-24 | 8 | -26/+84 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '1.16' | Jeff Forcier | 2016-04-24 | 1 | -2/+3 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Be clearer | Jeff Forcier | 2016-04-24 | 1 | -2/+3 |
| * | | | | | Merge branch '1.16' | Jeff Forcier | 2016-04-24 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Apparently a whole lot of people noticed that tiny python 3 issue | Jeff Forcier | 2016-04-24 | 1 | -1/+1 |
| * | | | | | Merge branch '1.16' | Jeff Forcier | 2016-04-24 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Oh hey this also fixes the only other open 1.16.1 ticket yey | Jeff Forcier | 2016-04-24 | 1 | -1/+1 |
| * | | | | | Merge branch '1.16' | Jeff Forcier | 2016-04-24 | 4 | -3/+47 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Changelog re #617, #679, #678, #685. | Jeff Forcier | 2016-04-24 | 1 | -0/+5 |
| | * | | | | Python 2.6 fix re: assertIn | Jeff Forcier | 2016-04-24 | 1 | -3/+4 |
| | * | | | | Support pickling hypothetical subclasses | Marius Gedminas | 2016-04-24 | 1 | -1/+1 |
| | * | | | | Improve NoValidConnectionsError formatting | Marius Gedminas | 2016-04-24 | 2 | -3/+21 |
| | * | | | | Fix tests on Python 3.x | Marius Gedminas | 2016-04-24 | 1 | -1/+1 |
| | * | | | | Make NoValidConnectionsError picklable correctly | Marius Gedminas | 2016-04-24 | 3 | -1/+21 |
| * | | | | | Merge branch '1.16' | Jeff Forcier | 2016-04-24 | 2 | -3/+5 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Changelog re #619, re #613 | Jeff Forcier | 2016-04-24 | 1 | -0/+2 |
| | * | | | | Merge branch '1.16' into 619-int | Jeff Forcier | 2016-04-24 | 81 | -1170/+4591 |
| | |\ \ \ \ | |||||
| | * | | | | | Update per jaraco.windows 3.4.1 | Jason R. Coombs | 2015-11-10 | 1 | -4/+4 |
| * | | | | | | Merge branch '1.16' | Jeff Forcier | 2016-04-24 | 2 | -0/+8 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge branch '1.15' into 1.16 | Jeff Forcier | 2016-04-24 | 2 | -0/+8 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Expose some effectively-public Channel attributes in API docs. | Jeff Forcier | 2016-04-24 | 2 | -0/+8 |
| * | | | | | | Merge branch '1.16' | Jeff Forcier | 2016-04-23 | 3 | -20/+23 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch '1.15' into 1.16 | Jeff Forcier | 2016-04-23 | 3 | -20/+23 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Meh | Jeff Forcier | 2016-04-23 | 1 | -1/+1 |
| | | * | | | | Refactor because ugh. | Jeff Forcier | 2016-04-23 | 1 | -19/+18 |
| | | * | | | | Update existing test to prove #632 | Jeff Forcier | 2016-04-23 | 1 | -2/+2 |
| | | * | | | | Changelog closes #632 | Jeff Forcier | 2016-04-23 | 1 | -0/+3 |
| | | * | | | | Update sftp_client.py | Abhinav | 2016-04-23 | 1 | -2/+2 |
| * | | | | | | Merge branch '1.16' | Jeff Forcier | 2016-04-23 | 1 | -2/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch '1.15' into 1.16 | Jeff Forcier | 2016-04-23 | 1 | -2/+3 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Fix broken changelog doc link | Jeff Forcier | 2016-04-23 | 1 | -2/+3 |
* | | | | | | | s/CFFI/libffi/ as per @reaperhulk | Jeff Forcier | 2016-04-23 | 1 | -2/+2 |
* | | | | | | | Fix broken changelog doc link | Jeff Forcier | 2016-04-23 | 1 | -2/+3 |