summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-02-14 09:16:43 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-02-14 09:16:43 -0800
commit758543f2381809c54a9cea38228847ccfecceb9f (patch)
tree43861e87d92ad5e997f47bae52845765858df753 /sites
parent27223637ce17adb5fe96abdfc6f136b3862c1bc7 (diff)
parentfb772a8695a95df3aa1cd3dd45aa6c42302e8640 (diff)
Merge branch '1.11' into 1.12
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 47946a27..1f0d55fe 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,13 @@
Changelog
=========
+* :bug:`252` (`Fabric #1020 <https://github.com/fabric/fabric/issues/1020>`_)
+ Enhanced the implementation of ``ProxyCommand`` to avoid a deadlock/hang
+ condition that frequently occurs at ``Transport`` shutdown time. Thanks to
+ Mateusz Kobos, Matthijs van der Vleuten and Guillaume Zitta for the original
+ reports and to Marius Gedminas for helping test nontrivial use cases.
+* :bug:`268` Fix some missed renames of ``ProxyCommand`` related error classes.
+ Thanks to Marius Gedminas for catch & patch.
* :bug:`34` (PR :issue:`35`) Fix SFTP prefetching incompatibility with some
SFTP servers regarding request/response ordering. Thanks to Richard
Kettlewell for catch & patch.