Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-22 | 1 | -0/+2 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Changelog fixes #290 | Jeff Forcier | 2014-03-22 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Merge branch '1.12' into 1.13 | Jeff Forcier | 2014-03-21 | 1 | -0/+2 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-21 | 1 | -0/+2 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Add a setup.cfg identifying this package as universal | Alex Gaynor | 2014-03-21 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | Meaning that it's build is not system dependent. Which it's not, because it's pure python. Refs #275 | |||||
* | | | | Merge branch '1.12' into 1.13 | Jeff Forcier | 2014-03-21 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-21 | 1 | -1/+1 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge branch '1.10' into 1.11 | Jeff Forcier | 2014-03-21 | 1 | -1/+1 | |
| | |\ \ | | | |/ | ||||||
| | | * | Uggh how did this slip in | Jeff Forcier | 2014-03-21 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch '1.12' into 1.13 | Jeff Forcier | 2014-03-21 | 1 | -0/+2 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-21 | 1 | -0/+2 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Changelog re #284 | Jeff Forcier | 2014-03-21 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | NO python 2.5 for 1.13+ | Jeff Forcier | 2014-03-21 | 1 | -1/+0 | |
| | | | | ||||||
* | | | | Merge branch '1.12' into 1.13 | Jeff Forcier | 2014-03-21 | 1 | -0/+1 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-21 | 1 | -0/+1 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Forgot python 2.5 | Jeff Forcier | 2014-03-21 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Merge branch '1.12' into 1.13 | Jeff Forcier | 2014-03-21 | 1 | -18/+28 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: setup.py | |||||
| * | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-21 | 1 | -18/+26 | |
| |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: setup.py | |||||
| | * | | Indent/order shuffle, no actionable changes | Jeff Forcier | 2014-03-21 | 1 | -23/+26 | |
| | | | | ||||||
| | * | | Backport alex/patch-2, Python trove classifiers | Jeff Forcier | 2014-03-21 | 1 | -1/+6 | |
| | | | | ||||||
* | | | | Merge branch '1.12' into 1.13 | Jeff Forcier | 2014-03-13 | 1 | -0/+3 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: paramiko/file.py paramiko/server.py paramiko/sftp_client.py sites/www/changelog.rst | |||||
| * | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-13 | 4 | -3/+6 | |
| |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: sites/www/changelog.rst | |||||
| | * | | Improve string type testing in Python 2.x versions | Jeff Forcier | 2014-03-13 | 4 | -3/+6 | |
| | | | | ||||||
* | | | | Changelog for 1.13.0 | Jeff Forcier | 2014-03-13 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Merge branch '1.12' into 1.13 | Jeff Forcier | 2014-03-13 | 1 | -0/+3 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: sites/www/changelog.rst | |||||
| * | | | Changelog for 1.12.3 | Jeff Forcier | 2014-03-13 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-13 | 1 | -0/+2 | |
| |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: sites/www/changelog.rst | |||||
| | * | | Changelog for 1.11.5 | Jeff Forcier | 2014-03-13 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Merge branch '1.12'v1.13.01.13.0 | Jeff Forcier | 2014-03-13 | 0 | -0/+0 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Cut 1.12.3v1.12.31.12.3 | Jeff Forcier | 2014-03-13 | 2 | -2/+2 | |
| | | | | ||||||
| * | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-13 | 0 | -0/+0 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge branch '1.10' into 1.11.v1.11.51.11.5 | Jeff Forcier | 2014-03-13 | 3 | -2/+3 | |
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Also bump versions like a dummy. Conflicts: paramiko/__init__.py setup.py | |||||
| | | * | Cut 1.10.7v1.10.71.10.7 | Jeff Forcier | 2014-03-13 | 3 | -2/+3 | |
| | | | | ||||||
* | | | | Bump releases version to 0.5.2 for better changelog | Jeff Forcier | 2014-03-13 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #276 from paramiko/python3 | Jeff Forcier | 2014-03-13 | 69 | -2303/+2599 | |
|\ \ \ \ | | | | | | | | | | | Merged-to-master Python 3 branch | |||||
| * | | | | New Alabaster for improved py2/3 + changelog style tweak | Jeff Forcier | 2014-03-13 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge remote-tracking branch 'scottkmaxwell/python3-with-import-fix' into ↵ | Jeff Forcier | 2014-03-13 | 43 | -475/+385 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | python3 | |||||
| | * | | | | Remove dead Py2.2 code and fix a bunch of PEP8 formatting | Scott Maxwell | 2014-03-08 | 1 | -18/+26 | |
| | | | | | | ||||||
| | * | | | | Fix import * and a bunch of PEP8 formatting | Scott Maxwell | 2014-03-07 | 43 | -457/+359 | |
| | | | | | | ||||||
| * | | | | | Fix accidental Markdown formatting miss for an older entry | Jeff Forcier | 2014-03-13 | 1 | -4/+4 | |
| | | | | | | ||||||
| * | | | | | Add changelog re #16 | Jeff Forcier | 2014-03-13 | 1 | -0/+7 | |
| |/ / / / | ||||||
| * | | | | Attempt to fix docs for py3 | Jeff Forcier | 2014-03-07 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Remove race condition regression re #276 | Jeff Forcier | 2014-03-07 | 1 | -1/+0 | |
| | | | | | ||||||
| * | | | | Start in on star import eradication | Jeff Forcier | 2014-03-07 | 10 | -10/+11 | |
| | | | | | ||||||
| * | | | | Remove an old Py2.5-ism | Jeff Forcier | 2014-03-07 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Skip failing test on Py3 | Jeff Forcier | 2014-03-07 | 1 | -0/+5 | |
| | | | | | ||||||
| * | | | | Make `byte_ord` gentlerpy3-test-parity | Jeff Forcier | 2014-03-07 | 1 | -1/+3 | |
| | | | | | ||||||
| * | | | | Fix some Py2-isms in constant_time_bytes_eq | Jeff Forcier | 2014-03-07 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Another fix that looked important but wasn't | Jeff Forcier | 2014-03-07 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | This doesn't really matter, but whatever | Jeff Forcier | 2014-03-07 | 1 | -1/+1 | |
| | | | | |