Merge branch '1.11' into 1.12
Conflicts: paramiko/__init__.py setup.py
This commit is contained in:
commit
33d412a2c6
|
@ -2,6 +2,8 @@
|
|||
Changelog
|
||||
=========
|
||||
|
||||
* :release:`1.11.4 <2014-02-14>`
|
||||
* :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
|
||||
|
|
Loading…
Reference in New Issue