summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-01-19 14:47:33 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-01-19 14:47:33 -0800
commit8d1fb10d58b4e80ce225bacb634f4544df8aef48 (patch)
tree6c5fc99722cb4ca6878459f55d5952d50617ac7c /sites/www
parent38cc76f8586ef141fdd051a97a65dc0c7e93f645 (diff)
parent4968eaf8c92c0b59037444dcd4ce08a71e203ec2 (diff)
Merge branch '1.14' into 1.15
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 972b8d43..b565e0e3 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.
* :bug:`652` Fix behavior of ``gssapi-with-mic`` auth requests so they fail
gracefully (allowing followup via other auth methods) instead of raising an
exception. Patch courtesy of ``@jamercee``.