summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2014-09-06Merge branch 'master' into 234-intJeff Forcier
2014-09-06Bah humbugJeff Forcier
2014-09-05Yup, that was indeed too fucking clever. Bad bitprophet!Jeff Forcier
2014-09-05Fix a Python 3 encoding dealieJeff Forcier
2014-09-05Forgot to actually implement allowed-keys/reverse testingJeff Forcier
2014-09-05Changelog re #218Jeff Forcier
2014-09-05Add a couple more permutationsJeff Forcier
2014-09-05Overhaul multi-key test to set up multiple scenariosJeff Forcier
2014-09-05Factor fingerprint data out of classJeff Forcier
2014-09-05More cleanup to support ECDSA key, and now it works!Jeff Forcier
2014-09-05Add RSA key fingerprint, now that test passesJeff Forcier
2014-09-05Set things up for cleaner test key tomfooleryJeff Forcier
2014-09-05Add an explicit RSA test, which fails (!)Jeff Forcier
2014-09-05Refactor horrible old copypastaJeff Forcier
2014-09-05Formatting tweaksJeff Forcier
2014-09-05Merge branch 'master' into 218-intJeff Forcier
2014-09-05Changelog re #335Jeff Forcier
2014-09-05Merge branch 'master' into 335-intJeff Forcier
2014-09-05Add a (failing :() test re: ECDSA private keysJeff Forcier
Re #218
2014-09-05Merge branch 'master' into 218-intJeff Forcier
2014-09-05Changelog re #184Jeff Forcier
2014-09-05Merge branch 'master' into 184-intJeff Forcier
Conflicts: paramiko/config.py tests/test_util.py
2014-09-05Fix an oversight re: py3 & strings in listdir_iterJeff Forcier
2014-09-05Changelog re #131Jeff Forcier
2014-09-05Make read ahead kwarg a bit less verboseJeff Forcier
2014-09-05Merge branch 'master' into 131-intJeff Forcier
2014-09-05Merge branch '1.14'Jeff Forcier
2014-09-05Merge branch '1.13' into 1.14Jeff Forcier
2014-09-05Try skipping docs builds under Python 3.2Jeff Forcier
2014-09-05Add quick test re #131Jeff Forcier
2014-09-0580-col tweaksJeff Forcier
2014-09-05Update docstring for listdir_iterJeff Forcier
2014-09-05Merge branch 'master' into 131-intJeff Forcier
2014-09-05Merge branch '1.14'Jeff Forcier
2014-09-05Merge branch '1.13' into 1.14Jeff Forcier
Conflicts: dev-requirements.txt
2014-09-05s/gittip/gratipay/Jeff Forcier
2014-09-05Nuke old commentJeff Forcier
2014-09-05No notices for travis irc notificationsJeff Forcier
2014-08-26Merge branch '1.14'Jeff Forcier
Conflicts: paramiko/_version.py
2014-08-26Merge branch '1.13' into 1.14Jeff Forcier
Conflicts: paramiko/__init__.py setup.py sites/www/changelog.rst
2014-08-26Consolidate version info. Closes #249Jeff Forcier
Conflicts: paramiko/__init__.py setup.py sites/www/changelog.rst
2014-08-26Merge branch '1.14'Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-08-26Merge branch '1.13' into 1.14Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-08-26Backport #378 to 1.13, closes #378Jeff Forcier
2014-08-26Merge branch '1.14'Jeff Forcier
2014-08-26Merge branch '1.13' into 1.14Jeff Forcier
2014-08-26Forgot to mark one support-bug as backportedJeff Forcier
2014-08-26Merge branch '1.14'Jeff Forcier
2014-08-26Merge branch '1.13' into 1.14Jeff Forcier
2014-08-26Fix up release taskJeff Forcier