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
|
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
|
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
|
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
|
2690a90ccb
|
Bump to releases bugfix
|
2014-02-11 14:51: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
|
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 |
|
Jeff Forcier
|
280c240685
|
Whitespace
|
2014-02-10 18:11:29 -08:00 |
|
Jeff Forcier
|
aed86f26bf
|
Future import for with: under py25
|
2014-02-10 18:10:52 -08:00 |
|
Jeff Forcier
|
9fa2cfee9d
|
Replace incorrect import of generic test runner w/ custom task
|
2014-02-10 18:03:25 -08:00 |
|
Jeff Forcier
|
1560c4ab8a
|
Merge remote-tracking branch 'ewxrjk/issue34' into sftp-reordering-34
|
2014-02-10 17:59:52 -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
|
cdf62655cb
|
Simplify www page footer.
Robey copyright remains in source code but this site is
brand new & the footer was real noisy. Eh.
|
2014-02-03 14:10:23 -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
|
781617ab47
|
Merge branch '1.11' into 1.12
Conflicts:
NEWS
|
2014-01-30 11:01:02 -08:00 |
|
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
|
c427667928
|
Merge branch '1.11' into 1.12
Conflicts:
sites/www/changelog.rst
|
2014-01-30 10:57:29 -08:00 |
|
Jeff Forcier
|
343d0492a7
|
Backport changelog bugfix from 1.12
|
2014-01-30 10:57:06 -08:00 |