summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-12-05 16:21:45 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-12-05 16:21:45 -0800
commit6de7464a454ccbc79f9757500b41ad4c74c85585 (patch)
tree8411709eb7e13999eec1d2b6bc5075d466e709b1
parent9532f195a51c969aa0fd0c73849d14994a74ebb2 (diff)
parentd2f83a1fd84222692ae779492ef50b82b3837e67 (diff)
Merge branch '2.0'
-rw-r--r--sites/www/changelog.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 3207d8f2..49ddd848 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :bug:`681` Fix a Python3-specific bug re: the handling of read buffers when
+ using ``ProxyCommand``. Thanks to Paul Kapp for catch & patch.
* :feature:`398` Add an ``environment`` dict argument to `Client.exec_command
<paramiko.client.SSHClient.exec_command>` (plus the lower level
`Channel.update_environment <paramiko.channel.Channel.update_environment>`