summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2014-01-08Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: NEWS
2014-01-08Merge branch '1.10' into 1.11Jeff Forcier
Conflicts: NEWS
2014-01-08Changelog, fixes #176Jeff Forcier
2014-01-08dittoNathan Scowcroft
2014-01-08Check correct stored hosts filename.Nathan Scowcroft
2014-01-08Saner (to me) positive assertionJeff Forcier
2014-01-08Small refactorJeff Forcier
2014-01-08No need for 'self.tc' within a single test :)Jeff Forcier
2014-01-08Add a testcase for client.save_host_keys.Martin Blumenstingl
2013-12-31Merge branch '1.11' into 1.12Jeff Forcier
2013-12-31Merge branch '1.10' into 1.11Jeff Forcier
2013-12-31Merge branch '1.9' into 1.10Jeff Forcier
2013-12-31Merge branch '1.8' into 1.9Jeff Forcier
2013-12-31Update travis settings to be similar to fab'sJeff Forcier
2013-12-31Merge branch '1.11' into 1.12Jeff Forcier
2013-12-31Merge branch '1.10' into 1.11Jeff Forcier
2013-12-31Merge branch '1.9' into 1.10Jeff Forcier
2013-12-31Merge branch '1.8' into 1.9Jeff Forcier
2013-12-31No more Python 2.5 on Travis :(Jeff Forcier
2013-10-16Merge branch '1.11' into 1.12Jeff Forcier
Conflicts: paramiko/__init__.py
2013-10-16Merge branch '1.10' into 1.11Jeff Forcier
Conflicts: paramiko/__init__.py
2013-10-16Merge branch '1.9' into 1.10Jeff Forcier
Conflicts: paramiko/__init__.py
2013-10-16Merge branch '1.8' into 1.9Jeff Forcier
Conflicts: paramiko/__init__.py
2013-10-16Reintroduce __version_info__ variableMike Gabriel
At least one application (mysql-workbench) (used to) use(s) the __version_info__ that got removed by commit 99859b8b021a5d13ca067a3e79560d6121f9c52f. Breaking existing software with new versions of paramiko should be avoided. This pull-request reintroduces the __version_info__ var, but fills it from the __version__ var. No need to maintain multiple version strings. Conflicts: paramiko/__init__.py
2013-09-27Merge branch '1.11'Jeff Forcier
Conflicts: paramiko/__init__.py setup.py
2013-09-27Merge branch '1.10' into 1.11Jeff Forcier
Updated versions for 1.11.2. Conflicts: paramiko/__init__.py setup.py
2013-09-27Update version for 1.10.4Jeff Forcier
2013-09-27Merge branch '1.11'Jeff Forcier
2013-09-27Clone 1.10.4 items to 1.11.2Jeff Forcier
2013-09-27Merge branch '1.10' into 1.11Jeff Forcier
2013-09-27Changelog re #199, fixes #199Jeff Forcier
2013-09-27Merge branch '1.11'Jeff Forcier
2013-09-27Merge branch '1.10' into 1.11Jeff Forcier
2013-09-27Merge branch '1.9' into 1.10Jeff Forcier
2013-09-27Merge branch '1.8' into 1.9Jeff Forcier
2013-09-27Fixed a typo in the license header of most filesJeff Forcier
Conflicts: paramiko/proxy.py
2013-09-27Fix demo re #200Jeff Forcier
2013-09-27Merge branch '1.11'Jeff Forcier
2013-09-27Merge branch '1.10' into 1.11Jeff Forcier
2013-09-27Changelog re #200Jeff Forcier
2013-09-27Merge branch '1.9' into 1.10Jeff Forcier
2013-09-27Merge branch '1.8' into 1.9Jeff Forcier
2013-09-27Fix demo re #200Jeff Forcier
2013-09-27Changelog re #136Jeff Forcier
2013-09-27Add support for the SSH env commandBenjamin Pollack
2013-09-27Merge branch '1.11'Jeff Forcier
2013-09-27Merge branch '1.10' into 1.11Jeff Forcier
2013-09-27Merge branch '1.9' into 1.10Jeff Forcier
2013-09-27Merge branch '1.8' into 1.9Jeff Forcier
2013-09-27Use verbose test output for travisJeff Forcier
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 19:38:07 +0000