summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-221-0/+2
| |\ \ \ | | |/ /
| | * | Changelog fixes #290Jeff Forcier2014-03-221-0/+2
| | | |
* | | | Merge branch '1.12' into 1.13Jeff Forcier2014-03-211-0/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-211-0/+2
| |\ \ \ | | |/ /
| | * | Add a setup.cfg identifying this package as universalAlex Gaynor2014-03-211-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.13Jeff Forcier2014-03-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-211-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch '1.10' into 1.11Jeff Forcier2014-03-211-1/+1
| | |\ \ | | | |/
| | | * Uggh how did this slip inJeff Forcier2014-03-211-1/+1
| | | |
* | | | Merge branch '1.12' into 1.13Jeff Forcier2014-03-211-0/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-211-0/+2
| |\ \ \ | | |/ /
| | * | Changelog re #284Jeff Forcier2014-03-211-0/+2
| | | |
* | | | NO python 2.5 for 1.13+Jeff Forcier2014-03-211-1/+0
| | | |
* | | | Merge branch '1.12' into 1.13Jeff Forcier2014-03-211-0/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-211-0/+1
| |\ \ \ | | |/ /
| | * | Forgot python 2.5Jeff Forcier2014-03-211-0/+1
| | | |
* | | | Merge branch '1.12' into 1.13Jeff Forcier2014-03-211-18/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: setup.py
| * | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-211-18/+26
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: setup.py
| | * | Indent/order shuffle, no actionable changesJeff Forcier2014-03-211-23/+26
| | | |
| | * | Backport alex/patch-2, Python trove classifiersJeff Forcier2014-03-211-1/+6
| | | |
* | | | Merge branch '1.12' into 1.13Jeff Forcier2014-03-131-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: paramiko/file.py paramiko/server.py paramiko/sftp_client.py sites/www/changelog.rst
| * | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-134-3/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: sites/www/changelog.rst
| | * | Improve string type testing in Python 2.x versionsJeff Forcier2014-03-134-3/+6
| | | |
* | | | Changelog for 1.13.0Jeff Forcier2014-03-131-0/+1
| | | |
* | | | Merge branch '1.12' into 1.13Jeff Forcier2014-03-131-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: sites/www/changelog.rst
| * | | Changelog for 1.12.3Jeff Forcier2014-03-131-0/+1
| | | |
| * | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-131-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: sites/www/changelog.rst
| | * | Changelog for 1.11.5Jeff Forcier2014-03-131-0/+1
| | | |
* | | | Merge branch '1.12'v1.13.01.13.0Jeff Forcier2014-03-130-0/+0
|\ \ \ \ | |/ / /
| * | | Cut 1.12.3v1.12.31.12.3Jeff Forcier2014-03-132-2/+2
| | | |
| * | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-130-0/+0
| |\ \ \ | | |/ /
| | * | Merge branch '1.10' into 1.11.v1.11.51.11.5Jeff Forcier2014-03-133-2/+3
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Also bump versions like a dummy. Conflicts: paramiko/__init__.py setup.py
| | | * Cut 1.10.7v1.10.71.10.7Jeff Forcier2014-03-133-2/+3
| | | |
* | | | Bump releases version to 0.5.2 for better changelogJeff Forcier2014-03-131-1/+1
| | | |
* | | | Merge pull request #276 from paramiko/python3Jeff Forcier2014-03-1369-2303/+2599
|\ \ \ \ | | | | | | | | | | Merged-to-master Python 3 branch
| * | | | New Alabaster for improved py2/3 + changelog style tweakJeff Forcier2014-03-131-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'scottkmaxwell/python3-with-import-fix' into ↵Jeff Forcier2014-03-1343-475/+385
| |\ \ \ \ | | | | | | | | | | | | | | | | | | python3
| | * | | | Remove dead Py2.2 code and fix a bunch of PEP8 formattingScott Maxwell2014-03-081-18/+26
| | | | | |
| | * | | | Fix import * and a bunch of PEP8 formattingScott Maxwell2014-03-0743-457/+359
| | | | | |
| * | | | | Fix accidental Markdown formatting miss for an older entryJeff Forcier2014-03-131-4/+4
| | | | | |
| * | | | | Add changelog re #16Jeff Forcier2014-03-131-0/+7
| |/ / / /
| * | | | Attempt to fix docs for py3Jeff Forcier2014-03-071-2/+2
| | | | |
| * | | | Remove race condition regression re #276Jeff Forcier2014-03-071-1/+0
| | | | |
| * | | | Start in on star import eradicationJeff Forcier2014-03-0710-10/+11
| | | | |
| * | | | Remove an old Py2.5-ismJeff Forcier2014-03-071-1/+1
| | | | |
| * | | | Skip failing test on Py3Jeff Forcier2014-03-071-0/+5
| | | | |
| * | | | Make `byte_ord` gentlerpy3-test-parityJeff Forcier2014-03-071-1/+3
| | | | |
| * | | | Fix some Py2-isms in constant_time_bytes_eqJeff Forcier2014-03-071-2/+2
| | | | |
| * | | | Another fix that looked important but wasn'tJeff Forcier2014-03-071-1/+1
| | | | |
| * | | | This doesn't really matter, but whateverJeff Forcier2014-03-071-1/+1
| | | | |