summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-24 20:20:17 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-24 20:20:17 -0700
commitbf2625109700470e9a1b4022220219da10179527 (patch)
tree9fd5afbe77846129d8489f9ffb0572b1b215bcdc /sites
parentca21c9f648590e38e52fa8799f1d6f074d0055de (diff)
parent1cda0eb75cd5e1f7da383e52df349ae8419349e8 (diff)
Merge branch 'master' into 394-int
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 7f3667e3..488360d7 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,12 @@
Changelog
=========
+* :support:`729 backported` Clean up ``setup.py`` to always use ``setuptools``,
+ not doing so was a historical artifact from bygone days. Thanks to Alex
+ Gaynor.
+* :bug:`649 major` Update the module in charge of handling SSH moduli so it's
+ consistent with OpenSSH behavior re: prime number selection. Thanks to Damien
+ Tournoud for catch & patch.
* :bug:`617` (aka `fabric/fabric#1429
<https://github.com/fabric/fabric/issues/1429>`_; via :issue:`679`; related:
:issue:`678`, :issue:`685`, :issue:`615` & :issue:`616`) Fix up