Commit Graph

85 Commits

Author SHA1 Message Date
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 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 88b568b76d Changelog re #136 2013-09-27 20:59:02 -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 e185178876 Changelog re #156, closes #156 2013-09-27 17:33:53 -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 f783d4d818 LOL @ different ordering in different versions. WTB sphinx plz 2013-09-20 18:09:59 -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 fa61f3c398 Changelog re #36 2013-09-20 14:13:08 -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 d2c71ed999 Merge branch '1.10'
Conflicts:
	NEWS
	setup.py
2013-07-26 15:06:58 -07:00
Jeff Forcier c8b75a489c Update changelog for release 2013-07-26 15:04:16 -07:00
Ethan Glasser-Camp a733c428cd Add NEWS entry 2013-04-30 00:25:53 -04: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
Jeff Forcier 3966ac103c Changelog re #146 (also start 10.10.2 section) 2013-04-27 22:12:24 -07:00
Jeff Forcier 6747d9944a Changelog re #87 2013-04-27 20:50:29 -07:00
Jeff Forcier b329512636 Merge branch '1.10'
Conflicts:
	NEWS
2013-04-05 13:02:11 -07:00
Jeff Forcier 02d071be07 Bump version to 1.10.1 2013-04-05 13:00:19 -07:00
Jeff Forcier 1d494eb0db Changelog re #154 2013-04-05 12:58:44 -07:00
Jeff Forcier 73a0d03bdc Merge branch '1.10'
Conflicts:
	NEWS
2013-04-05 11:51:47 -07:00
Jeff Forcier 17ba0d5b61 Dumb format tweak to NEWS 2013-04-05 11:51:19 -07:00
Jeff Forcier 0392e3df8f Shuffle changelog 2013-03-19 13:37:55 -07:00
Jeff Forcier a7ee2509e4 Merge branch 'master' into 112-int
Conflicts:
	paramiko/win_pageant.py
2013-03-19 13:36:52 -07:00
Jeff Forcier d5db603297 Move changelog re #100 to new release chunk 2013-03-19 13:25:25 -07:00
Jason R. Coombs 0cc6bb970f Updated NEWS 2013-03-19 13:24:31 -07:00
Jason R. Coombs abe009b149 Update NEWS per #142 2013-03-04 08:49:47 -05:00
Jeff Forcier 721f74d8c2 Changelog re #66, re #141. Fixes #66 2013-03-01 12:01:35 -08:00
Jeff Forcier dd7edd8ec8 Changelog re #133, and date fix for 1.10 2013-03-01 10:34:35 -08:00
Jeff Forcier 277526315e Changelog re #93 2013-03-01 09:42:09 -08:00
Jeff Forcier b9242c654a Changelog re #110 2013-02-27 19:49:29 -08:00
Jeff Forcier bf4b535920 Changelog re #128 2013-02-27 19:40:09 -08:00
Jeff Forcier e034a24f87 Add changelog entry re #102 2013-02-27 18:50:40 -08:00
Jeff Forcier 8e697988af Changelog + docs re #127 2013-02-27 15:56:09 -08:00
Jeff Forcier ac9370d3e0 Changelog re #116 2013-02-27 15:32:19 -08:00
Jeff Forcier e761502e8e Add changelog entry re #115 2013-02-03 12:54:53 -08:00