Commit Graph

1370 Commits

Author SHA1 Message Date
Jeff Forcier 3b0df60b6a This handily explains why everything was really confusing in autodoc 2014-02-14 16:49:29 -08:00
Jeff Forcier 95b5fd2255 Remove autodoc boilerplate flags from automodule directives 2014-02-14 15:48:39 -08:00
Jeff Forcier 4a98671bf6 Tweak conf.py in prep for less boilerplatey versions of module files 2014-02-14 13:59:34 -08:00
Jeff Forcier 2346f1a1e9 Swap out all-in-one file with sphinx-apidoc generated stuff 2014-02-14 13:33:22 -08:00
Jeff Forcier 6cdb8291b7 Merge branch '1.10' into sphinx-256 2014-02-14 12:10:02 -08:00
Jeff Forcier b140b29d54 Hook API doc into index/toctree 2014-02-14 12:09:59 -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 9d7aeff7b1 Use constant time hash comparisons for improved security.
See e.g. http://codahale.com/a-lesson-in-timing-attacks/

Mega thanks to Alex Gaynor for the original patch.
2014-02-14 11:52:00 -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 d438ff6b64 Don't raise timeouts as ProxyCommand failures, thanks @mgedmin 2014-02-13 13:44:46 -08:00
Jeff Forcier 4402f67fa6 Don't drop/lose data when our inner timeout goges off. 2014-02-13 13:44:27 -08:00
Jeff Forcier 244e09f57a Slightly safer socket.error handling 2014-02-13 12:54:23 -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
Marius Gedminas cfd1efe648 Fix NameError in error-handling case
Fixes #268
2014-02-13 09:38:00 -08:00
Jeff Forcier 58489c893e Potentially horrible attempt at manual subprocess-read timeouts 2014-02-12 17:16:34 -08:00
Jeff Forcier 5b6059c4bd Nuke old merge mistake (or what looks like one anyway.) 2014-02-12 09:48:04 -08:00
Jeff Forcier 28d52444fe Merge branch '1.12' 2014-02-11 15:11:41 -08:00
Jeff Forcier 27223637ce Merge branch '1.11' into 1.12 2014-02-11 15:11:38 -08:00
Jeff Forcier 769f6fea98 Merge branch '1.10' into 1.11 2014-02-11 15:11:35 -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 725b96c0ae Not a fan of pointless getters. 2014-02-11 15:04:34 -08:00
Jeff Forcier 3e87f4aa27 Formatting 2014-02-11 15:04:31 -08:00
Johan Prins 985c3069fb Adding banner functionality 2014-02-11 15:01:29 -08:00
Jeff Forcier 2690a90ccb Bump to releases bugfix 2014-02-11 14:51:39 -08:00
Jeff Forcier a31dcf1913 Merge branch '1.12' 2014-02-11 14:26:42 -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 2d3b13e917 Add coverage command as Invoke task 2014-02-11 09:31:43 -08:00
Jeff Forcier 675e30986e Clean up a list-comp (also fixes race condition) 2014-02-11 08:06:14 -08:00
Jeff Forcier 1d87a0ceb9 Herp and a derp 2014-02-10 18:21:29 -08:00