dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
931 Commits 8 Branches 20 Tags 3.3 MiB
Commit Graph

931 Commits

Author SHA1 Message Date
Jeff Forcier 6ecde066fc Cut 1.12.1 2014-01-08 16:41:44 -08:00
Jeff Forcier 69ec7455ee Merge branch '1.11' into 1.12 
Conflicts:
	paramiko/__init__.py
	setup.py
 2014-01-08 16:41:29 -08:00
Jeff Forcier 1ff3db96f6 Cut 1.11.3 2014-01-08 16:41:04 -08:00
Jeff Forcier 9bf65daebe Merge branch '1.10' into 1.11 
Conflicts:
	paramiko/__init__.py
	setup.py
 2014-01-08 16:40:49 -08:00
Jeff Forcier 698adf10fb Cut 1.10.5 2014-01-08 16:40:11 -08:00
Jeff Forcier 566f37c0f2 ecdsa in README; fixes #225 2014-01-08 16:29:56 -08:00
Jeff Forcier 96ca8d49c1 Merge branch '1.11' into 1.12 
Conflicts:
	NEWS
 2014-01-08 13:43:42 -08:00
Jeff Forcier b352357efb Merge branch '1.10' into 1.11 
Conflicts:
	NEWS
 2014-01-08 13:43:03 -08:00
Jeff Forcier b57e825f77 Changelog, fixes #176 2014-01-08 12:49:27 -08:00
Nathan Scowcroft 0fea895cdb ditto 2014-01-08 12:45:22 -08:00
Nathan Scowcroft a1c1f8f29f Check correct stored hosts filename. 2014-01-08 12:45:14 -08:00
Jeff Forcier 6d326fcde2 Saner (to me) positive assertion 2014-01-08 12:44:12 -08:00
Jeff Forcier 74e06aff9e Small refactor 2014-01-08 12:39:26 -08:00
Jeff Forcier 78d9e4834c No need for 'self.tc' within a single test :) 2014-01-08 12:35:46 -08:00
Martin Blumenstingl bfc3953be0 Add a testcase for client.save_host_keys. 2014-01-08 12:27:24 -08:00
Jeff Forcier b3e53df8b9 Merge branch '1.11' into 1.12 2013-12-31 19:24:39 -08:00
Jeff Forcier ec95e8d943 Merge branch '1.10' into 1.11 2013-12-31 19:24:39 -08:00
Jeff Forcier 302e3bde38 Merge branch '1.9' into 1.10 2013-12-31 19:24:39 -08:00
Jeff Forcier bbcc6c7d8d Merge branch '1.8' into 1.9 2013-12-31 19:24:39 -08:00
Jeff Forcier c695a931ff Update travis settings to be similar to fab's 2013-12-31 19:24:10 -08:00
Jeff Forcier 7985d08138 Merge branch '1.11' into 1.12 2013-12-31 19:14:50 -08:00
Jeff Forcier b22de7d61b Merge branch '1.10' into 1.11 2013-12-31 19:14:46 -08:00
Jeff Forcier f253612e93 Merge branch '1.9' into 1.10 2013-12-31 19:14:44 -08:00
Jeff Forcier 89e2592ead Merge branch '1.8' into 1.9 2013-12-31 19:14:39 -08:00
Jeff Forcier 91a8066686 No more Python 2.5 on Travis :( 2013-12-31 19:14:36 -08:00
Jeff Forcier a9a5f69c1a Merge branch '1.11' into 1.12 
Conflicts:
	paramiko/__init__.py
 2013-10-16 17:01:01 -07:00
Jeff Forcier 75c4304fe2 Merge branch '1.10' into 1.11 
Conflicts:
	paramiko/__init__.py
 2013-10-16 17:00:46 -07:00
Jeff Forcier 3232ce84ed Merge branch '1.9' into 1.10 
Conflicts:
	paramiko/__init__.py
 2013-10-16 17:00:33 -07:00
Jeff Forcier 858d3fd07f Merge branch '1.8' into 1.9 
Conflicts:
	paramiko/__init__.py
 2013-10-16 17:00:13 -07:00
Mike Gabriel 6b222528f3 Reintroduce __version_info__ variable 
At least one application (mysql-workbench) (used to) use(s) the __version_info__
that got removed by commit 99859b8b02.

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-10-16 16:59:35 -07:00
Jeff Forcier c73764a947 Merge branch '1.11' 
Conflicts:
	paramiko/__init__.py
	setup.py
 2013-09-27 22:01:17 -07:00
Jeff Forcier 96fdefbcb9 Merge branch '1.10' into 1.11 
Updated versions for 1.11.2.

Conflicts:
	paramiko/__init__.py
	setup.py
 2013-09-27 22:00:32 -07:00
Jeff Forcier f2466a3d46 Update version for 1.10.4 2013-09-27 21:59:48 -07:00
Jeff Forcier 48c67e24e0 Merge branch '1.11' 2013-09-27 21:57:42 -07:00
Jeff Forcier ceb39683dc Clone 1.10.4 items to 1.11.2 2013-09-27 21:57:37 -07:00
Jeff Forcier f88875da3f Merge branch '1.10' into 1.11 2013-09-27 21:57:16 -07:00
Jeff Forcier 8fcccce3d5 Changelog re #199, fixes #199 2013-09-27 21:56:57 -07:00
Jeff Forcier 28d78e4e6a Merge branch '1.11' 2013-09-27 21:29:59 -07:00
Jeff Forcier 07e61c3552 Merge branch '1.10' into 1.11 2013-09-27 21:29:56 -07:00
Jeff Forcier e25c7c4bdf Merge branch '1.9' into 1.10 2013-09-27 21:29:51 -07:00
Jeff Forcier 2de9c72720 Merge branch '1.8' into 1.9 2013-09-27 21:29:41 -07:00
Jeff Forcier 83f44878ea Fixed a typo in the license header of most files 
Conflicts:
	paramiko/proxy.py
 2013-09-27 21:29:18 -07:00
Jeff Forcier d4e18e1d1c Fix demo re #200 2013-09-27 21:20:28 -07:00
Jeff Forcier c3befd18a4 Merge branch '1.11' 2013-09-27 21:16:18 -07:00
Jeff Forcier 65271c65d2 Merge branch '1.10' into 1.11 2013-09-27 21:16:10 -07:00
Jeff Forcier 57046f44cb Changelog re #200 2013-09-27 21:16:06 -07:00
Jeff Forcier 1627ea6603 Merge branch '1.9' into 1.10 2013-09-27 21:14:35 -07:00
Jeff Forcier 8cdbcfa1ff Merge branch '1.8' into 1.9 2013-09-27 21:13:25 -07:00
Jeff Forcier e0d4fdbc5d Fix demo re #200 2013-09-27 21:13:21 -07:00
Jeff Forcier 88b568b76d Changelog re #136 2013-09-27 20:59:02 -07:00