summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-01-19 14:46:46 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-01-19 14:46:46 -0800
commit4968eaf8c92c0b59037444dcd4ce08a71e203ec2 (patch)
tree55fc99130c78131b8e911de482d8afe2084080b4 /sites/www
parenta1fbc37779f9bb1ee152057e7110d5b1c77a863c (diff)
parent1919014fa649d32dec4039f2b8c115233c082418 (diff)
Merge branch '1.13' into 1.14
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 1926ab17..bad37089 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
Changelog
=========
+* :bug:`499` Strip trailing/leading whitespace from lines when parsing SSH
+ config files - this brings things in line with OpenSSH behavior. Thanks to
+ Alfredo Esteban for the original report and Nick Pillitteri for the patch.
* :support:`636` Clean up and enhance the README (and rename it to
``README.rst`` from just ``README``). Thanks to ``@LucasRMehl``.
* :bug:`401` Fix line number reporting in log output regarding invalid