diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-12-18 14:00:54 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-12-18 14:00:54 -0800 |
| commit | 2926ffbca0d7acdbdfdc06615976da3a7278f7ad (patch) | |
| tree | ec2647249355635a45611f9e4d5547d5c2fe765d /sites | |
| parent | b3732cde6f2bea22fbbfd7ec6124489f61e502b7 (diff) | |
| parent | 3905dfb0a8f719b435125d404ca4403f9849e17c (diff) | |
Merge branch '1.13' into 1.14
Conflicts:
sites/www/changelog.rst
Diffstat (limited to 'sites')
| -rw-r--r-- | sites/www/changelog.rst | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index a1d640af..f951273d 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -11,7 +11,8 @@ Changelog the SFTP modules) concerning incorrect behavior by `~paramiko.file.BufferedFile.readlines` on files whose size exceeds the buffer size. Thanks to ``@achapp`` for catch & patch. -* :support:`422` Clean up some unused imports. Courtesy of Olle Lundberg. +* :support:`422 backported` Clean up some unused imports. Courtesy of Olle + Lundberg. * :bug:`266` Change numbering of `~paramiko.transport.Transport` channels to start at 0 instead of 1 for better compatibility with OpenSSH & certain server implementations which break on 1-indexed channels. Thanks to @@ -27,8 +28,8 @@ Changelog ``@sherbang`` and ``@adamkerz`` for the patches. * :support:`378 backported` Minor code cleanup in the SSH config module courtesy of Olle Lundberg. -* :support:`249` Consolidate version information into one spot. Thanks to Gabi - Davar for the reminder. +* :support:`249 backported` Consolidate version information into one spot. + Thanks to Gabi Davar for the reminder. * :release:`1.14.1 <2014-08-25>` * :release:`1.13.2 <2014-08-25>` * :bug:`376` Be less aggressive about expanding variables in ``ssh_config`` |