Commit Graph

139 Commits

Author SHA1 Message Date
Jeff Forcier 4cc9d9f562 Uggh how did this slip in 2014-03-21 17:29:31 -07:00
Jeff Forcier 7feeb272a0 Uggh how did this slip in 2014-03-21 17:28:25 -07:00
Jeff Forcier 6fac5df535 Start an FAQ and answer it with a new install section 2014-03-21 17:28:19 -07:00
Jeff Forcier a183cd3bb1 Merge branch '1.13' 2014-03-21 11:23:13 -07:00
Jeff Forcier 6875bfd795 Merge branch '1.12' into 1.13 2014-03-21 11:23:09 -07:00
Jeff Forcier 3780c0314c Merge branch '1.11' into 1.12 2014-03-21 11:23:06 -07:00
Jeff Forcier 2c0544fc35 Changelog re #284 2014-03-21 11:23:03 -07:00
Jeff Forcier ebc1f38611 Merge branch 'python3' 2014-03-15 15:00:20 -07:00
Jeff Forcier fe9171661a Merge branch '1.12' into 1.13
Conflicts:
	paramiko/file.py
	paramiko/server.py
	paramiko/sftp_client.py
	sites/www/changelog.rst
2014-03-13 21:54:12 -07:00
Jeff Forcier a8ad23e61a Merge branch '1.11' into 1.12
Conflicts:
	sites/www/changelog.rst
2014-03-13 21:52:56 -07:00
Jeff Forcier 9ad2dec32a Improve string type testing in Python 2.x versions 2014-03-13 21:52:34 -07:00
Jeff Forcier e032541b78 Changelog for 1.13.0 2014-03-13 21:37:02 -07:00
Jeff Forcier 9695500303 Merge branch '1.12' into 1.13
Conflicts:
	sites/www/changelog.rst
2014-03-13 21:36:48 -07:00
Jeff Forcier b94af130b5 Changelog for 1.12.3 2014-03-13 21:36:26 -07:00
Jeff Forcier 005cfb8b25 Merge branch '1.11' into 1.12
Conflicts:
	sites/www/changelog.rst
2014-03-13 21:36:05 -07:00
Jeff Forcier 4e9efe4830 Changelog for 1.11.5 2014-03-13 21:35:48 -07:00
Jeff Forcier c538a00012 Merge branch '1.10' into 1.11.
Also bump versions like a dummy.

Conflicts:
	paramiko/__init__.py
	setup.py
2014-03-13 21:27:46 -07:00
Jeff Forcier 4fdb4b5ae5 Cut 1.10.7 2014-03-13 21:25:44 -07:00
Jeff Forcier b0b6a827b9 Update docs to reflect Python 2.6+, 3.3+ compat 2014-03-13 21:05:32 -07:00
Jeff Forcier 120071283d Fix accidental Markdown formatting miss for an older entry 2014-03-13 11:15:34 -07:00
Jeff Forcier 8463053fa5 Add changelog re #16 2014-03-13 11:15:20 -07:00
Jeff Forcier 7a776b1757 Testing out intersphinx in changelog 2014-03-04 17:43:30 -08:00
Jeff Forcier 32975af9a6 Merge branch '1.12' 2014-03-04 16:16:38 -08:00
Jeff Forcier 38785d9cd2 Merge branch '1.11' into 1.12 2014-03-04 16:16:36 -08:00
Jeff Forcier d5ed558c21 Merge branch '1.10' into 1.11 2014-03-04 16:16:33 -08:00
Jeff Forcier 798e3689dd Note Sphinx docs issue was backported 2014-03-04 16:16:29 -08:00
Jeff Forcier b9cea90581 Merge branch '1.12' 2014-03-04 11:45:12 -08:00
Jeff Forcier fac6cde874 Merge branch '1.11' into 1.12
Conflicts:
	paramiko/hostkeys.py
2014-03-04 11:44:57 -08:00
Jeff Forcier 72a73f55fa Merge branch '1.10' into 1.11
Conflicts:
	fabfile.py
	paramiko/__init__.py
2014-03-03 18:24:04 -08:00
Jeff Forcier 056323979d Re-enable Intersphinx from www -> docs 2014-03-03 18:22:33 -08:00
Jeff Forcier 83f09e634f Changelog re #256 2014-03-03 17:30:15 -08:00
Jeff Forcier a24ca77636 Merge branch '1.12' 2014-02-14 11:54:43 -08:00
Jeff Forcier 0965eaa65d Merge branch '1.11' into 1.12
Conflicts:
	paramiko/hostkeys.py
	sites/www/changelog.rst
2014-02-14 11:54:39 -08:00
Jeff Forcier 4e9af2f7ca Merge branch '1.10' into 1.11
Conflicts:
	sites/www/changelog.rst
2014-02-14 11:53:59 -08:00
Jeff Forcier 30518280f1 Changelog re hash comparison bugfix 2014-02-14 11:53:42 -08:00
Jeff Forcier 3fcde4e7f4 Merge branch '1.12'
Conflicts:
	sites/www/changelog.rst
2014-02-14 09:39:38 -08:00
Jeff Forcier fb786bea9c Cut 1.12.2 2014-02-14 09:39:11 -08:00
Jeff Forcier 33d412a2c6 Merge branch '1.11' into 1.12
Conflicts:
	paramiko/__init__.py
	setup.py
2014-02-14 09:38:40 -08:00
Jeff Forcier 4a5f007c02 Cut 1.11.4 2014-02-14 09:38:14 -08:00
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 6aada73b0e Merge branch '1.12' 2014-02-14 09:32:11 -08:00
Jeff Forcier ddea189319 Merge branch '1.11' into 1.12 2014-02-14 09:32:08 -08:00
Jeff Forcier 6d4b37a17f Catch & patch trimming 2014-02-14 09:32:05 -08:00
Jeff Forcier 73382933a7 Merge branch '1.12'
Conflicts:
	sites/www/changelog.rst
2014-02-14 09:17:04 -08:00
Jeff Forcier 758543f238 Merge branch '1.11' into 1.12 2014-02-14 09:16:43 -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 40708571bc Merge branch 'banner-functionality' 2014-02-11 15:11:23 -08:00
Jeff Forcier c73616b5b3 Changelog re #58 2014-02-11 15:10:39 -08:00
Jeff Forcier 3a7b66a814 Merge branch '1.11' into 1.12
Conflicts:
	sites/www/changelog.rst
2014-02-11 14:26:34 -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 c7090c52de Merge branch '1.11' into 1.12 2014-02-03 14:11:00 -08:00
Jeff Forcier 36abefdac0 Merge branch '1.10' into 1.11 2014-02-03 14:10:58 -08:00
Jeff Forcier 0f2fb26287 Update to new Alabaster version for footer/extension stuff 2014-02-03 14:09:56 -08:00
Jeff Forcier 792cfe0cf6 Merge branch '1.11' into 1.12
Conflicts:
	sites/www/changelog.rst
2014-01-30 14:32:22 -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 5aa0d401f6 Merge branch '1.11' into 1.12 2014-01-30 14:29:19 -08:00
Jeff Forcier 397cd4ce99 Merge branch '1.10' into 1.11 2014-01-30 14:29:16 -08:00
Jeff Forcier 55722240b5 Fix broken link format 2014-01-30 14:20:13 -08:00
Jeff Forcier 52183257d0 Remove blog link for now 2014-01-30 14:20:04 -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 5ba3761f21 Fix some boogs in changelog 2014-01-30 10:55:10 -08:00
Jeff Forcier 14929d6909 1.12 releases 2014-01-30 10:45:00 -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 b8d1724f57 Comment out intersphinx pending #256 2014-01-29 14:24:54 -08:00
Jeff Forcier 2b0f834c16 Move API doc sister link to www site only, derp 2014-01-29 14:23:46 -08:00
Jeff Forcier b60075c7cd Prevent warning about unlinked blog page 2014-01-28 16:00:03 -08:00
Jeff Forcier 7b690707dd Don't display blog for now 2014-01-28 12:50:24 -08:00
Jeff Forcier 87cd72c144 Set up Intersphinx so www can ref docs 2014-01-23 15:36:03 -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
Jeff Forcier 5a1f927310 Blog only used/exists in www, don't import it in docs site 2014-01-22 10:55:39 -08:00
Jeff Forcier 2da9142520 Rename 'main' doctree to 'www'; refactor sphinx task conf 2014-01-21 16:59:21 -08:00