diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-02-14 09:38:40 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-02-14 09:38:40 -0800 |
| commit | 33d412a2c6f62601f4bcac116915d23ceabcf98d (patch) | |
| tree | 6c8bf22b3715e25ab68a134ffa8e289f11698114 /sites/www/changelog.rst | |
| parent | ddea189319a685999b372699b9f5b81cfab5a9cb (diff) | |
| parent | 4a5f007c029cfabac35161d8147d616c79009bd8 (diff) | |
Merge branch '1.11' into 1.12
Conflicts:
paramiko/__init__.py
setup.py
Diffstat (limited to 'sites/www/changelog.rst')
| -rw-r--r-- | sites/www/changelog.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 0a53209d..f9906170 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -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 |