summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-01-19 14:47:36 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-01-19 14:47:36 -0800
commit670e0fa7b9a80624cca5432720f8ff4ff9b3ef19 (patch)
treed2965099d3c7d023cbca2be107073a73b53a7584 /sites/www
parentdf43fe9911ae414fef4112763446088ea88918bc (diff)
parent8d1fb10d58b4e80ce225bacb634f4544df8aef48 (diff)
Merge branch '1.15' into 1.16
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 cb103d61..b92f5a1a 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``.