summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-24 14:14:35 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-24 14:14:35 -0700
commitff0209f4c55eeb902a6037449a0e256b56877bcb (patch)
treef90d3e02ce7b429c0c43eadfe73590703375e4c1 /sites/www
parent7a439156ad17108edc117761934542a20c11339a (diff)
parenta3a8d3f1f1f6c7431e2c79fb798cf884021e375a (diff)
Merge branch '1.16'
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 0ef46349..ad92fcd1 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -4,7 +4,7 @@ Changelog
* :bug:`617` (aka `fabric/fabric#1429
<https://github.com/fabric/fabric/issues/1429>`_; via :issue:`679`; related:
- :issue:`678`, :issue:`685`, :issue:`616`) Fix up
+ :issue:`678`, :issue:`685`, :issue:`615` & :issue:`616`) Fix up
`~paramiko.ssh_exception.NoValidConnectionsError` so it pickles correctly.
Thanks to Rebecca Schlussel for the report & Marius Gedminas for the patch.
* :bug:`613` (via :issue:`619`) Update to ``jaraco.windows`` 3.4.1 to fix some