Commit Graph

865 Commits

Author SHA1 Message Date
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 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 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 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 f2466a3d46 Update version for 1.10.4 2013-09-27 21:59:48 -07:00
Jeff Forcier 8fcccce3d5 Changelog re #199, fixes #199 2013-09-27 21:56:57 -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 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 1009b72ed0 Merge branch '1.9' into 1.10 2013-09-27 20:09:47 -07:00
Jeff Forcier be68ca1020 Merge branch '1.8' into 1.9 2013-09-27 20:09:43 -07:00
Jeff Forcier 152f126869 Use verbose test output for travis 2013-09-27 20:09:41 -07:00
Jeff Forcier 8b983d9d3d Changelog re #179 2013-09-27 16:10:56 -07:00
Jeff Forcier 05abcc40f5 Fix #179 - missing host variable in fqdn evaluation 2013-09-27 16:08:59 -07:00
Jeff Forcier 0ba34035c3 Not sure how this got updated :( 2013-09-20 17:56:20 -07:00
Jeff Forcier db9dfebca8 Changelog re #168 2013-09-20 14:46:32 -07:00
Jeff Forcier 02387fc88c Merge branch '1.10' into 168-int
Conflicts:
	NEWS
	setup.py
2013-09-20 14:39:55 -07:00
Jeff Forcier fa61f3c398 Changelog re #36 2013-09-20 14:13:08 -07:00
Jonathan Halcrow 7ed1e2bccc This fixes a Bad file descriptor error caused by attempting to access the request after it has already been closed. 2013-09-20 14:12:32 -07:00
Jeff Forcier f7d74d03d9 Changelog entry re #162 2013-09-20 13:44:28 -07:00
Jeff Forcier 565eff8274 Apply slightly modified version of patch from #162 2013-09-20 13:19:01 -07:00
Jeff Forcier 965d00dee9 Version bump 2013-07-26 15:05:35 -07:00
Jeff Forcier c8b75a489c Update changelog for release 2013-07-26 15:04:16 -07:00
Emre Yılmaz 3399d519e0 updated config to be compatible with multiple localforward and remoteforward options. 2013-05-21 00:40:28 +03:00
Jeff Forcier d77a4d6421 Merge branch '1.10' 2013-05-05 13:59:41 -07:00
Jeff Forcier 3c2f01c91f Flip bad known_hosts line to INFO from WARN re #153 2013-05-05 13:59:34 -07:00
Jeff Forcier 777d1576ca Bump dev version 2013-04-28 19:01:40 -07:00
Jeff Forcier d0c7a5d884 Merge branch 'master' of github.com:paramiko/paramiko 2013-04-28 18:50:37 -07:00
Jeff Forcier b33d9c7bca Merge branch '1.10' 2013-04-28 18:41:15 -07:00
Jeff Forcier b2b8d5d0a6 Add explicit link to updated API docs. Fixes #160 2013-04-28 18:41:10 -07:00
Jeff Forcier 0b9393b063 Merge pull request #155 from Baconator507/patch-1
Update demo.py
2013-04-28 18:38:27 -07:00
Jeff Forcier f00f87c9be Merge branch '1.10' 2013-04-28 18:10:15 -07:00
Ethan Glasser-Camp 8c7f120c2c Warn on parse failure when reading known_hosts 2013-04-28 18:10:02 -07:00
Jeff Forcier 675d79d743 Merge pull request #153 from glasserc/log_bad_hostkeys
Warn on parse failure when reading known_hosts
2013-04-28 18:08:55 -07:00
Ethan Glasser-Camp aee2355d24 Warn on parse failure when reading known_hosts 2013-04-28 14:21:05 -04:00
Jeff Forcier a1fa1ba9cc Merge branch '1.10'
Conflicts:
	NEWS
2013-04-27 22:15:07 -07:00