summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-24 14:16:42 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-24 14:16:42 -0700
commit972619dc208768be57b23ece4ac31e642bc72620 (patch)
tree3f2106f47ba2f14e5902843dbd8e7864855e33b7
parentff0209f4c55eeb902a6037449a0e256b56877bcb (diff)
parent8311ad95adbfefa681f1c827c047a740f46f11fc (diff)
Merge branch '1.16'
-rw-r--r--sites/www/changelog.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index ad92fcd1..7f3667e3 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -5,8 +5,9 @@ Changelog
* :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
- `~paramiko.ssh_exception.NoValidConnectionsError` so it pickles correctly.
- Thanks to Rebecca Schlussel for the report & Marius Gedminas for the patch.
+ `~paramiko.ssh_exception.NoValidConnectionsError` so it pickles correctly,
+ and fix a related Python 3 compatibility issue. 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
errors related to ``ctypes`` on Windows platforms. Credit to Jason R. Coombs.
* :support:`621 backported` Annotate some public attributes on