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

908 Commits

Author SHA1 Message Date
Scott Maxwell e5822c9fa1 Add Py3.2 and Py3.3 to travis 2013-10-30 16:02:01 -07:00
Scott Maxwell 7aaf42a7b1 Add Py3 compatibility support helpers 2013-10-30 15:59:58 -07: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
Benjamin Pollack 5e744d37c7 Add support for the SSH env command 2013-09-27 20:51:31 -07:00
Jeff Forcier 3071811c70 Merge branch '1.11' 2013-09-27 20:09:54 -07:00
Jeff Forcier 68cad65bb2 Merge branch '1.10' into 1.11 2013-09-27 20:09:51 -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 18d48cc5f7 Add attribution to changelog 2013-09-27 20:01:57 -07:00
Jeff Forcier 91922eb80e Shuffle changelog entry around. 2013-09-27 19:49:44 -07:00
Jeff Forcier e0b401b8d9 Merge branch '152-int' into 152-real-int 
Conflicts:
	paramiko/hostkeys.py
	requirements.txt
 2013-09-27 17:50:25 -07:00
Jeff Forcier 8ab4cbd2a0 Bump version for dev 2013-09-27 17:44:06 -07:00
Jeff Forcier 6a6b200c32 Merge branch '1.11' 2013-09-27 17:33:58 -07:00
Jeff Forcier e185178876 Changelog re #156, closes #156 2013-09-27 17:33:53 -07:00
Jeff Forcier cba4c68365 Merge branch '1.11' into 156-int 2013-09-27 17:30:34 -07:00
Jeff Forcier 483d7e1462 Merge branch '1.11' 2013-09-27 16:15:35 -07:00
Jeff Forcier 7243f8fe90 Merge branch '1.10' into 1.11 
Conflicts:
	NEWS
 2013-09-27 16:15:31 -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 2ef0ab9f6a Merge branch '1.11' 2013-09-20 18:10:04 -07:00
Jeff Forcier f783d4d818 LOL @ different ordering in different versions. WTB sphinx plz 2013-09-20 18:09:59 -07:00
Jeff Forcier b9629f0fd6 Merge branch '1.11' 2013-09-20 18:02:06 -07:00
Jeff Forcier bea7d9dc8a Christ almighty I hate non-DRY versioning 2013-09-20 18:01:42 -07:00
Jeff Forcier 723131500a Merge branch '1.11' 2013-09-20 17:58:13 -07:00
Jeff Forcier 2de0784d4e Versions: hard? 2013-09-20 17:57:23 -07:00