summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-02-27 17:22:42 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-02-27 17:22:42 -0800
commit45ae305c646c6466ba8e45044a38b4edc45b33bc (patch)
tree0befc2bd37535fc84368d6848d80b3fcd30ef9b8 /sites/www
parent8d1fb10d58b4e80ce225bacb634f4544df8aef48 (diff)
parentd6b38c9c529f1f401ce4f6bcf13bebcc73e063a0 (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 b565e0e3..6c772355 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
Changelog
=========
+* :support:`697` Remove whitespace in our ``setup.py``'s ``install_requires``
+ as it triggers occasional bugs in some versions of ``setuptools``. Thanks to
+ Justin Lecher for catch & original patch.
* :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.