summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-02-27 17:22:46 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-02-27 17:22:46 -0800
commit57d4802a3d72adb84b856d0a9c15e35303308589 (patch)
tree2e0b0b3a263fdab117bc4ea3ddf60cae0786ba94 /sites
parent670e0fa7b9a80624cca5432720f8ff4ff9b3ef19 (diff)
parent45ae305c646c6466ba8e45044a38b4edc45b33bc (diff)
Merge branch '1.15' into 1.16
Diffstat (limited to 'sites')
-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 b92f5a1a..191bdcaf 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.