summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-22 23:37:05 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-22 23:37:05 -0700
commited3c0b8e182c188e4d70883aeefb5e4b2b8cd054 (patch)
treea8ead6986f27387c144954cb2a2ccee8476034ff /sites
parent57d4802a3d72adb84b856d0a9c15e35303308589 (diff)
parentbf52180fef7b5266fbe727e2b659686da2c39b9b (diff)
Merge branch '1.15' into 1.16
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 191bdcaf..51167851 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,10 @@
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.