summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-06-21 13:26:42 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-06-21 13:26:42 -0700
commit52376f2fce4dff1b6c79ff03233c3ca1cdffc46e (patch)
tree0ca4ceb587aed264f83d0948d169d6d00ea27ed9
parent73110f8ef827e97044d7cc73447798e5da3075eb (diff)
parentcc8ac73c09396f2f8b258261452b2013370b6b22 (diff)
downloadparamiko-52376f2fce4dff1b6c79ff03233c3ca1cdffc46e.tar.gz
Merge branch '1.17' into 2.0
-rw-r--r--sites/www/changelog.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index df818b47..913ecf47 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,7 +2,10 @@
Changelog
=========
-* :bug:`537` Fix a bug in `BufferedPipe.set_event
+* :bug:`520 (1.16+)` (Partial fix) Fix at least one instance of race condition
+ driven threading hangs at end of the Python interpreter session. (Includes a
+ docs update as well - always make sure to ``.close()`` your clients!)
+* :bug:`537 (1.16+)` Fix a bug in `BufferedPipe.set_event
<paramiko.buffered_pipe.BufferedPipe.set_event>` which could cause
deadlocks/hangs when one uses `select.select` against
`~paramiko.channel.Channel` objects (or otherwise calls `Channel.fileno