summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-25 18:44:59 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-25 18:44:59 -0700
commite9cc18a3986de129b7efc54c1edfd19bad218798 (patch)
tree1b3179a56ac40b152395582f150814444d58df8d /sites
parent09b38a4ebdb6d70377794a4da55db5d1775e7078 (diff)
parent8a89fb0e2924e8f5c3ed31ddcd0cc0ee1337dd57 (diff)
Merge branch '1.17'
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index c3111f0d..835b7c85 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -5,6 +5,12 @@ Changelog
* :release:`1.17.0 <2016-04-25>`
* :release:`1.16.1 <2016-04-25>`
* :release:`1.15.5 <2016-04-25>`
+* :bug:`670` Due to an earlier bugfix, less-specific ``Host`` blocks'
+ ``ProxyCommand`` values were overriding ``ProxyCommand none`` in
+ more-specific ``Host`` blocks. This has been fixed in a backwards compatible
+ manner (i.e. ``ProxyCommand none`` continues to appear as a total lack of any
+ ``proxycommand`` key in parsed config structures). Thanks to Pat Brisbin for
+ the catch.
* :bug:`676` (via :issue:`677`) Fix a backwards incompatibility issue that
cropped up in `SFTPFile.prefetch <~paramiko.sftp_file.prefetch>` re: the
erroneously non-optional ``file_size`` parameter. Should only affect users