summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Cut 1.12.1v1.12.11.12.1Jeff Forcier2014-01-082-2/+2
* Merge branch '1.11' into 1.12Jeff Forcier2014-01-080-0/+0
|\
| * Cut 1.11.3v1.11.31.11.3Jeff Forcier2014-01-082-2/+2
| * Merge branch '1.10' into 1.11Jeff Forcier2014-01-080-0/+0
| |\
| | * Cut 1.10.5v1.10.51.10.5Jeff Forcier2014-01-082-2/+2
* | | ecdsa in README; fixes #225Jeff Forcier2014-01-082-0/+3
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-01-083-3/+53
|\ \ \ | |/ /
| * | Merge branch '1.10' into 1.11Jeff Forcier2014-01-083-3/+46
| |\ \ | | |/
| | * Changelog, fixes #176Jeff Forcier2014-01-081-0/+7
| | * dittoNathan Scowcroft2014-01-081-1/+1
| | * Check correct stored hosts filename.Nathan Scowcroft2014-01-081-2/+2
| | * Saner (to me) positive assertionJeff Forcier2014-01-081-1/+4
| | * Small refactorJeff Forcier2014-01-081-3/+5
| | * No need for 'self.tc' within a single test :)Jeff Forcier2014-01-081-6/+6
| | * Add a testcase for client.save_host_keys.Martin Blumenstingl2014-01-081-1/+25
* | | Merge branch '1.11' into 1.12Jeff Forcier2013-12-311-0/+4
|\ \ \ | |/ /
| * | Merge branch '1.10' into 1.11Jeff Forcier2013-12-311-0/+4
| |\ \ | | |/
| | * Merge branch '1.9' into 1.10Jeff Forcier2013-12-311-0/+4
| | |\
| | | * Merge branch '1.8' into 1.91.9Jeff Forcier2013-12-311-0/+4
| | | |\
| | | | * Update travis settings to be similar to fab's1.8Jeff Forcier2013-12-311-0/+4
* | | | | Merge branch '1.11' into 1.12Jeff Forcier2013-12-311-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '1.10' into 1.11Jeff Forcier2013-12-311-1/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '1.9' into 1.10Jeff Forcier2013-12-311-1/+0
| | |\ \ \ | | | |/ /
| | | * | Merge branch '1.8' into 1.9Jeff Forcier2013-12-311-1/+0
| | | |\ \ | | | | |/
| | | | * No more Python 2.5 on Travis :(Jeff Forcier2013-12-311-1/+0
* | | | | Merge branch '1.11' into 1.12Jeff Forcier2013-10-161-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '1.10' into 1.11Jeff Forcier2013-10-161-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '1.9' into 1.10Jeff Forcier2013-10-161-0/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch '1.8' into 1.9Jeff Forcier2013-10-161-0/+1
| | | |\ \ | | | | |/
| | | | * Reintroduce __version_info__ variableMike Gabriel2013-10-161-0/+1
* | | | | Merge branch '1.11'v1.12.01.12.0Jeff Forcier2013-09-270-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '1.10' into 1.11v1.11.21.11.2Jeff Forcier2013-09-272-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Update version for 1.10.4v1.10.41.10.4Jeff Forcier2013-09-272-2/+2
* | | | | Merge branch '1.11'Jeff Forcier2013-09-271-0/+9
|\ \ \ \ \ | |/ / / /
| * | | | Clone 1.10.4 items to 1.11.2Jeff Forcier2013-09-271-0/+7
| * | | | Merge branch '1.10' into 1.11Jeff Forcier2013-09-271-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Changelog re #199, fixes #199Jeff Forcier2013-09-271-0/+2
* | | | | Merge branch '1.11'Jeff Forcier2013-09-2761-61/+61
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '1.10' into 1.11Jeff Forcier2013-09-2761-61/+61
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '1.9' into 1.10Jeff Forcier2013-09-2761-61/+61
| | |\ \ \ | | | |/ /
| | | * | Merge branch '1.8' into 1.9Jeff Forcier2013-09-2761-61/+61
| | | |\ \ | | | | |/
| | | | * Fixed a typo in the license header of most filesJeff Forcier2013-09-2761-61/+61
| | | | * Fix demo re #200Jeff Forcier2013-09-271-1/+1
* | | | | Merge branch '1.11'Jeff Forcier2013-09-272-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '1.10' into 1.11Jeff Forcier2013-09-272-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Changelog re #200Jeff Forcier2013-09-271-0/+2
| | * | | Merge branch '1.9' into 1.10Jeff Forcier2013-09-271-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch '1.8' into 1.9Jeff Forcier2013-09-271-1/+1
| | | |\ \
| | | | * | Fix demo re #200Jeff Forcier2013-09-271-1/+1
| | | | |/
* | | | | Changelog re #136Jeff Forcier2013-09-271-0/+2