summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-02-20 14:46:53 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-02-20 14:46:53 -0800
commitf7bb33a55de43c73098c14a2b4d66489870008c7 (patch)
tree14b6a11bf540781f6b92854f3db122d0cf9315a8 /sites
parent37978cc748bd40e5ea4caa747692ff4a0ab82f2c (diff)
parentd09ca08d628ade6e04d708a6b7010801eeda4503 (diff)
Merge branch '1.17' into 1.18
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index a4fa8473..02120e31 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
Changelog
=========
+* :bug:`862 (1.17+)` (via :issue:`863`) Avoid test suite exceptions on
+ platforms lacking ``errno.ETIME`` (which seems to be some FreeBSD and some
+ Windows environments.) Thanks to Sofian Brabez.
* :bug:`44 (1.17+)` (via :issue:`891`) `SSHClient <paramiko.client.SSHClient>`
now gives its internal `Transport <paramiko.transport.Transport>` a handle on
itself, preventing garbage collection of the client until the session is