diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-12-18 14:01:26 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-12-18 14:01:26 -0800 |
| commit | 8914b5b50eab969b3496ea7d67e21e75104714b3 (patch) | |
| tree | 5bd378176aee45c9f36ada149eb1210242aad097 /sites/www/changelog.rst | |
| parent | 6a3630dd638abafbb7befa52c59001a0d0ae49e9 (diff) | |
| parent | 2926ffbca0d7acdbdfdc06615976da3a7278f7ad (diff) | |
Merge branch '1.14' into 1.15
Conflicts:
sites/www/changelog.rst
Diffstat (limited to 'sites/www/changelog.rst')
| -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 cd948812..f6f2bb28 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -20,7 +20,8 @@ Changelog fix. * :support:`431` Replace handrolled ``ssh_config`` parsing code with use of the ``shlex`` module. Thanks to Yan Kalchevskiy. -* :support:`422` Clean up some unused imports. Courtesy of Olle Lundberg. +* :support:`422 backported` Clean up some unused imports. Courtesy of Olle + Lundberg. * :support:`421` Modernize threading calls to user newer API. Thanks to Olle Lundberg. * :support:`419` Modernize a bunch of the codebase internals to leverage @@ -99,8 +100,8 @@ Changelog async/generator based file listings. Thanks to John Begeman. * :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`` |