summaryrefslogtreecommitdiffhomepage
path: root/sites/www
AgeCommit message (Collapse)Author
2014-12-18Merge branch 'master' into switch-to-cryptographyAlex Gaynor
Conflicts: paramiko/ecdsakey.py paramiko/util.py
2014-12-17Changelog closes #455Jeff Forcier
2014-12-17Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-12-17Merge branch '1.13' into 1.14Jeff Forcier
2014-12-17Changelog closes #428Jeff Forcier
2014-12-17Changelog re #415Jeff Forcier
2014-12-17Dyslexia strikes again. Actually close #431, not #413Jeff Forcier
2014-12-17Changelog closes #413Jeff Forcier
2014-12-17Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-12-17Merge branch '1.13' into 1.14Jeff Forcier
2014-12-17Changelog closes #422Jeff Forcier
2014-12-17Changelog re #421, closes #421Jeff Forcier
2014-12-17Changelog re #419, closes #419Jeff Forcier
2014-12-17Merge branch '1.15'Jeff Forcier
2014-12-17Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: paramiko/transport.py
2014-12-17Merge branch '1.13' into 1.14Jeff Forcier
2014-12-17Changelog re #266Jeff Forcier
2014-12-17Merge branch '1.15'Jeff Forcier
2014-12-17Merge branch '1.14' into 1.15Jeff Forcier
2014-12-17Merge branch '1.13' into 1.14Jeff Forcier
2014-12-17Changelog re #459Jeff Forcier
2014-11-12Merge branch '1.15'Jeff Forcier
2014-11-12Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: tests/test_util.py
2014-11-12Merge branch '1.13' into 1.14Jeff Forcier
2014-11-12Changelog re #429Jeff Forcier
2014-10-01Merge branch '1.15'Jeff Forcier
2014-10-01Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-10-01Merge branch '1.13' into 1.14Jeff Forcier
2014-10-01Changelog re #320Jeff Forcier
Closes #409
2014-09-29Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2014-09-22Merge branch '1.15'Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-09-22Cut 1.15.1Jeff Forcier
2014-09-22Changelog re #399Jeff Forcier
2014-09-20Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2014-09-19Changelog re #167Jeff Forcier
2014-09-18Document that pyasn1 is requiredAlex Gaynor
2014-09-18Add back intro sentenceAlex Gaynor
2014-09-18Note OPenSSL headers as wellAlex Gaynor
2014-09-18Merge branch 'master' into switch-to-cryptographyAlex Gaynor
Conflicts: paramiko/ecdsakey.py tests/test_client.py
2014-09-18Cut 1.15Jeff Forcier
2014-09-18Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2014-09-18Changelog re #393Jeff Forcier
2014-09-18Note how python-gssapi only works on 2.7+Jeff Forcier
2014-09-18Install docs tweak re: GSSAPI reqJeff Forcier
2014-09-16Try to update the installation docsAlex Gaynor
2014-09-08Tweak changelog again for more tickets, use actually-merged PR as main issue ↵Jeff Forcier
number
2014-09-08Update README, docs, changelog re #267Jeff Forcier
2014-09-08Update changelog re #267, #250Jeff Forcier
2014-09-08Merge branch 'master' into 267-intJeff Forcier
Conflicts: paramiko/client.py paramiko/transport.py sites/www/changelog.rst
2014-09-08Changelog re #346Jeff Forcier