diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-04-25 18:44:56 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-04-25 18:44:56 -0700 |
| commit | a9f222be52639e82ecdd9839293df5f3f74f6673 (patch) | |
| tree | ea25c45c2ce61b1554dac64673a92fd65397638e /sites | |
| parent | 5c97c4a05cbc2c3c3515aec9913622470503eee7 (diff) | |
| parent | 7d66aa62e7b8074a643d84cd4324c58750b10f1d (diff) | |
Merge branch '1.15' into 1.16
Diffstat (limited to 'sites')
| -rw-r--r-- | sites/www/changelog.rst | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index cf75a595..a58857b8 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -4,6 +4,12 @@ Changelog * :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 |