summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-24 14:12:58 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-24 14:12:58 -0700
commit7a439156ad17108edc117761934542a20c11339a (patch)
tree55c446022ea30a39b3d7d07f2b4699e8dbeeeb66
parent63621c973e89762007e47b8ec3366f73fc556dd6 (diff)
parentb7c9b5d7649903cd14ceb40f8e691aa27d413962 (diff)
Merge branch '1.16'
-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 340379fc..0ef46349 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`) Fix up
+ :issue:`678`, :issue:`685`, :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