diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-04-25 18:44:59 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-04-25 18:44:59 -0700 |
| commit | 8a89fb0e2924e8f5c3ed31ddcd0cc0ee1337dd57 (patch) | |
| tree | 7e497e9df54e2a87eac98258f9e21f64870a2aa7 /sites/www | |
| parent | 268acf810a15228e0d14a8ee3a4d96c0997f8e5d (diff) | |
| parent | a9f222be52639e82ecdd9839293df5f3f74f6673 (diff) | |
Merge branch '1.16' into 1.17
Diffstat (limited to 'sites/www')
| -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 740174b9..2c097986 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 |