summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2014-03-22Revert "Revert "Changelog fixes #290""Jeff Forcier
This reverts commit bd81c94825747f082c9c066abab8136d9831a3f2.
2014-03-22Merge branch '1.12' into 1.13Jeff Forcier
2014-03-22Merge branch '1.11' into 1.12Jeff Forcier
2014-03-22Revert "Changelog fixes #290"Jeff Forcier
This reverts commit 270dacaf33279bed2ae599d718183cec541e032d.
2014-03-22Revert "Add a setup.cfg identifying this package as universal"Jeff Forcier
This reverts commit 61e32319fc9f0390818e518a4890766d1253a165.
2014-03-22Merge branch '1.12' into 1.13Jeff Forcier
2014-03-22Merge branch '1.11' into 1.12Jeff Forcier
2014-03-22Changelog fixes #290Jeff Forcier
2014-03-21Merge branch '1.12' into 1.13Jeff Forcier
2014-03-21Merge branch '1.11' into 1.12Jeff Forcier
2014-03-21Add a setup.cfg identifying this package as universalAlex Gaynor
Meaning that it's build is not system dependent. Which it's not, because it's pure python. Refs #275
2014-03-21Merge branch '1.12' into 1.13Jeff Forcier
2014-03-21Merge branch '1.11' into 1.12Jeff Forcier
2014-03-21Merge branch '1.10' into 1.11Jeff Forcier
2014-03-21Uggh how did this slip inJeff Forcier
2014-03-21Merge branch '1.12' into 1.13Jeff Forcier
2014-03-21Merge branch '1.11' into 1.12Jeff Forcier
2014-03-21Changelog re #284Jeff Forcier
2014-03-21NO python 2.5 for 1.13+Jeff Forcier
2014-03-21Merge branch '1.12' into 1.13Jeff Forcier
2014-03-21Merge branch '1.11' into 1.12Jeff Forcier
2014-03-21Forgot python 2.5Jeff Forcier
2014-03-21Merge branch '1.12' into 1.13Jeff Forcier
Conflicts: setup.py
2014-03-21Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: setup.py
2014-03-21Indent/order shuffle, no actionable changesJeff Forcier
2014-03-21Backport alex/patch-2, Python trove classifiersJeff Forcier
2014-03-13Merge branch '1.12' into 1.13Jeff Forcier
Conflicts: paramiko/file.py paramiko/server.py paramiko/sftp_client.py sites/www/changelog.rst
2014-03-13Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-03-13Improve string type testing in Python 2.x versionsJeff Forcier
2014-03-13Changelog for 1.13.0Jeff Forcier
2014-03-13Merge branch '1.12' into 1.13Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-03-13Changelog for 1.12.3Jeff Forcier
2014-03-13Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-03-13Changelog for 1.11.5Jeff Forcier
2014-03-13Merge branch '1.12'Jeff Forcier
2014-03-13Cut 1.12.3Jeff Forcier
2014-03-13Merge branch '1.11' into 1.12Jeff Forcier
2014-03-13Merge branch '1.10' into 1.11.Jeff Forcier
Also bump versions like a dummy. Conflicts: paramiko/__init__.py setup.py
2014-03-13Cut 1.10.7Jeff Forcier
2014-03-13Bump releases version to 0.5.2 for better changelogJeff Forcier
2014-03-13Merge pull request #276 from paramiko/python3Jeff Forcier
Merged-to-master Python 3 branch
2014-03-13New Alabaster for improved py2/3 + changelog style tweakJeff Forcier
2014-03-13Merge remote-tracking branch 'scottkmaxwell/python3-with-import-fix' into ↵Jeff Forcier
python3
2014-03-13Fix accidental Markdown formatting miss for an older entryJeff Forcier
2014-03-13Add changelog re #16Jeff Forcier
2014-03-08Remove dead Py2.2 code and fix a bunch of PEP8 formattingScott Maxwell
2014-03-07Fix import * and a bunch of PEP8 formattingScott Maxwell
2014-03-07Attempt to fix docs for py3Jeff Forcier
2014-03-07Remove race condition regression re #276Jeff Forcier
2014-03-07Start in on star import eradicationJeff Forcier