diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-04-23 09:52:08 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-04-23 09:52:08 -0400 |
| commit | b4474bb60e8a081968efbfe7de2e5869522455e1 (patch) | |
| tree | 022c56dc1dd8d7b50048bebb5cf02f2c6d11ea7c /sites/www | |
| parent | 4b02a9b424be448aef5e00abe3bb22f56c84144b (diff) | |
| parent | a14d266ce13e1909203e59c8b84965070a0aa69f (diff) | |
Merge branch 'master' into remove-rc4
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index f87a6f83..eaf3cd57 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,13 @@ Changelog ========= +* :support:`612` Identify & work around a race condition in the test for + handshake timeouts, which was causing frequent test failures for a subset of + contributors as well as Travis-CI (usually, but not always, limited to Python + 3.5). Props to Ed Kellett for assistance during some of the troubleshooting. +* :support:`697` Remove whitespace in our ``setup.py``'s ``install_requires`` + as it triggers occasional bugs in some versions of ``setuptools``. Thanks to + Justin Lecher for catch & original patch. * :bug:`499` Strip trailing/leading whitespace from lines when parsing SSH config files - this brings things in line with OpenSSH behavior. Thanks to Alfredo Esteban for the original report and Nick Pillitteri for the patch. |