Commit Graph

1092 Commits

Author SHA1 Message Date
Jeff Forcier 9035546e40 Merge branch '1.10' into 1.11
Conflicts:
	NEWS
	sites/www/changelog.rst
2014-01-30 11:00:33 -08:00
Jeff Forcier c563f06954 Nuke sphinx-changelogg'd material 2014-01-30 10:59:15 -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 c636b273da Merge branch '1.10' into 1.11
Conflicts:
	dev-requirements.txt
	tox.ini
2014-01-29 14:38:58 -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 d1d65b4ddd Stricter/more useful doc builds in Travis 2014-01-28 15:53:30 -08:00
Jeff Forcier fee04a39ec Add sites/docs building to Travis 2014-01-28 15:23:11 -08:00
Jeff Forcier 414fec8f27 Bump Invoke requirement to newly released version w/ better Collection.from_module 2014-01-28 15:12:33 -08:00
Jeff Forcier 7b690707dd Don't display blog for now 2014-01-28 12:50:24 -08:00
Jeff Forcier da51cd8b14 Update to new alabaster-driven nav sidebar 2014-01-28 12:50:19 -08:00
Jeff Forcier 69d40710dc Tweak logo settings (& rely on new alabaster defaults) 2014-01-28 08:46:33 -08:00
Jeff Forcier 87cd72c144 Set up Intersphinx so www can ref docs 2014-01-23 15:36:03 -08:00
Olle Lundberg 24635609dc Epydoc -> Sphinx. 2014-01-23 11:32:59 +01: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
Jeff Forcier c224fdecf1 Use new behavior from newer Invoke 2014-01-21 16:15:30 -08:00
Jeff Forcier ccb7a6c2cd Start fleshing out two-site setup 2014-01-21 16:15:30 -08:00
Jeff Forcier 7d56ecb1a7 Meta prep work (reqs.txt, tasks.py) 2014-01-21 16:15:30 -08:00
Jeff Forcier c74ff2a16e Import paramiko.org repository @ 3ac370054ef10fb060fe75fff25fe3a70ecc02c0 2014-01-21 16:14:26 -08:00
Jeff Forcier 473a9cdf5b Merge branch '1.10' into 1.11 2014-01-21 14:00:41 -08:00
Olle Lundberg 5c5bf6e844 Add coveralls. 2014-01-21 14:00:34 -08:00
Jeff Forcier 2cf23bf784 Merge branch '1.10' into 1.11
Conflicts:
	NEWS
2014-01-21 13:58:44 -08:00
Jeff Forcier a7ea04842e Clean up thread ident import/exec a bit. 2014-01-21 13:51:09 -08:00
Jeff Forcier 2621db122d Add NEWS entry re #193 and friends 2014-01-21 13:49:18 -08:00
Aarni Koskela 39809dab31 Try Py2.5 compatibility as last fallback for thread identity. 2014-01-21 13:31:45 -08:00
Aarni Koskela b0c689d7c8 Support Py2.5 to Py3.4 for thread identity (thanks @lndbrg) 2014-01-21 13:31:43 -08:00
Aarni Koskela d32d457775 Fix agent auth on Windows/Python 2.5) (with thanks to @lndbrg) 2014-01-21 13:31:25 -08:00
Aarni Koskela d8738b1b0f Fix #193 (use RtlMoveMemory instead of msvcrt.memcpy) 2014-01-21 13:30:32 -08:00
Jeff Forcier 1ff3db96f6 Cut 1.11.3 2014-01-08 16:41:04 -08:00
Jeff Forcier 9bf65daebe Merge branch '1.10' into 1.11
Conflicts:
	paramiko/__init__.py
	setup.py
2014-01-08 16:40:49 -08:00
Jeff Forcier 698adf10fb Cut 1.10.5 2014-01-08 16:40:11 -08:00
Jeff Forcier b352357efb Merge branch '1.10' into 1.11
Conflicts:
	NEWS
2014-01-08 13:43:03 -08:00
Jeff Forcier b57e825f77 Changelog, fixes #176 2014-01-08 12:49:27 -08:00
Nathan Scowcroft 0fea895cdb ditto 2014-01-08 12:45:22 -08:00
Nathan Scowcroft a1c1f8f29f Check correct stored hosts filename. 2014-01-08 12:45:14 -08:00
Jeff Forcier 6d326fcde2 Saner (to me) positive assertion 2014-01-08 12:44:12 -08:00
Jeff Forcier 74e06aff9e Small refactor 2014-01-08 12:39:26 -08:00
Jeff Forcier 78d9e4834c No need for 'self.tc' within a single test :) 2014-01-08 12:35:46 -08:00