Commit Graph

26 Commits

Author SHA1 Message Date
Jeff Forcier 7b595f4a8b Merge branch '1.10' into 1.11
Conflicts:
	paramiko/__init__.py
	setup.py
	sites/www/changelog.rst
2014-02-14 09:37:34 -08:00
Jeff Forcier 457a34f55b Cut 1.10.6 2014-02-14 09:36:33 -08:00
Jeff Forcier 6d4b37a17f Catch & patch trimming 2014-02-14 09:32:05 -08:00
Jeff Forcier fb772a8695 Tweak changelog language 2014-02-14 09:16:35 -08:00
Jeff Forcier e3a16fac5a Braino in changelog text 2014-02-13 13:48:21 -08:00
Jeff Forcier 8003c738ca I hate you sometimes, ReST 2014-02-13 09:50:05 -08:00
Jeff Forcier c3eb903ed3 Preliminary changelog entry re #252 2014-02-13 09:48:58 -08:00
Jeff Forcier 0c493541eb Changelog re #268 2014-02-13 09:40:53 -08:00
Jeff Forcier 41d7339992 Merge branch '1.10' into 1.11
Conflicts:
	sites/www/changelog.rst
2014-02-11 14:23:50 -08:00
Jeff Forcier c142454621 Start reverting explicit-release stuff in favor of release-line specifiers on bugs. 2014-02-11 14:23:15 -08:00
Jeff Forcier 36b937d436 Merge branch '1.10' into 1.11 2014-02-11 09:48:00 -08:00
Jeff Forcier 0a2887a8cc Changelog re #35 2014-02-10 17:59:32 -08:00
Jeff Forcier fe3d3beca4 Fix extra colon in changelog 2014-02-10 17:59:25 -08:00
Jeff Forcier 0a90bef4f4 Merge branch '1.10' into 1.11
Conflicts:
	sites/www/changelog.rst
2014-01-30 14:32:10 -08:00
Jeff Forcier 4aa9668653 Don't preseed releases, ugh 2014-01-30 14:31:59 -08:00
Jeff Forcier 343d0492a7 Backport changelog bugfix from 1.12 2014-01-30 10:57:06 -08:00
Jeff Forcier 70bcde95c1 Backport changelog bugfix from 1.12 2014-01-30 10:56:03 -08:00
Jeff Forcier a83f0d3038 Add rest of 1.11 releases 2014-01-30 10:40:29 -08:00
Jeff Forcier d0d711ac78 Port 1.11.1 2014-01-29 15:20:53 -08:00
Jeff Forcier 176493823c Missed a spot w/ SnR 2014-01-29 15:16:09 -08:00
Jeff Forcier a58ee1c89a Missed a spot w/ SnR 2014-01-29 15:16:04 -08:00
Jeff Forcier 6646e36673 Add 1.11.0 to new changelog 2014-01-29 15:06:14 -08:00
Jeff Forcier 34320dfd61 Forgot to update backticks for Sphinx, derp 2014-01-29 15:06:03 -08:00
Jeff Forcier 2b64ff4cd9 Forgot to update backticks for Sphinx, derp 2014-01-29 15:05:52 -08:00
Jeff Forcier dde21a7de0 Nuke extraneous colons, add 'major' notes 2014-01-22 14:25:18 -08:00
Jeff Forcier 03768eadca Migrate 1.10.x NEWS entries to Sphinx changelog 2014-01-22 12:55:37 -08:00