Commit Graph

876 Commits

Author SHA1 Message Date
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 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 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 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 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 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 f783d4d818 LOL @ different ordering in different versions. WTB sphinx plz 2013-09-20 18:09:59 -07:00
Jeff Forcier bea7d9dc8a Christ almighty I hate non-DRY versioning 2013-09-20 18:01:42 -07:00
Jeff Forcier 2de0784d4e Versions: hard? 2013-09-20 17:57:23 -07:00
Jeff Forcier 4020b87419 Merge branch '1.10' into 1.11 2013-09-20 17:57:10 -07:00
Jeff Forcier 0ba34035c3 Not sure how this got updated :( 2013-09-20 17:56:20 -07:00
Jeff Forcier b3c0fb463a Copy some 1.10.3 changes to 1.11.1 changelog 2013-09-20 14:47:29 -07:00
Jeff Forcier e2aa7c17b0 Merge branch '1.10' into 1.11
Conflicts:
	NEWS
2013-09-20 14:47:09 -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 081b04116b Clone changelog entry for 1.11 2013-09-20 13:58:29 -07:00
Jeff Forcier 0355672721 Merge branch '1.10' into 1.11
Conflicts:
	NEWS
2013-09-20 13:45:18 -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 e6abab18ee Tag nag 2013-08-01 11:51:08 -07:00
Jeff Forcier 2a08a48dd2 Version bump/dumb-fix 2013-07-26 15:07:33 -07:00
Jeff Forcier d2c71ed999 Merge branch '1.10'
Conflicts:
	NEWS
	setup.py
2013-07-26 15:06:58 -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
Jeff Forcier caf94786ca Update doc upload task w/ static hostname 2013-07-07 15:40:38 -07:00
Jeff Forcier ba3ce80c14 Add ML link to docs 'index'
Fixes #48
2013-06-28 13:07:19 -07:00
Jeff Forcier 993ecb31d2 Port Makefile contents into fabfile 2013-06-28 13:07:06 -07:00
Jeff Forcier 4ee577abc5 Move reqs.txt to dev-reqs.txt, solidify tox req 2013-06-26 09:02:48 -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