Merge branch '1.10' into 1.11

Conflicts:
	paramiko/__init__.py
	setup.py
	sites/www/changelog.rst
This commit is contained in:
Jeff Forcier 2014-02-14 09:37:34 -08:00
commit 7b595f4a8b
1 changed files with 1 additions and 0 deletions

View File

@ -2,6 +2,7 @@
Changelog
=========
* :release:`1.10.6 <2014-02-14>`
* :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