summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-02-27 17:21:52 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-02-27 17:21:52 -0800
commitd6b38c9c529f1f401ce4f6bcf13bebcc73e063a0 (patch)
tree09515f8484fdbf98d1cc7b851384d39fb2b9ec17 /sites
parent4968eaf8c92c0b59037444dcd4ce08a71e203ec2 (diff)
parent6e1b0e74ddec41a95e0db4c0a60d81176e9de429 (diff)
Merge branch '1.13' into 1.14
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 bad37089..be493f02 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.