diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-02-11 14:23:50 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-02-11 14:23:50 -0800 |
| commit | 41d7339992a7141bd7499f5604f3db5b3389481e (patch) | |
| tree | 55f8183aee8d6728d5eab2354e1401b568eaa1f0 | |
| parent | 36b937d436e2fa1d77982d0f0fb1cd230bd42560 (diff) | |
| parent | c1424546219a769540fc70c54f268e284c0b2b85 (diff) | |
| download | paramiko-41d7339992a7141bd7499f5604f3db5b3389481e.tar.gz | |
Merge branch '1.10' into 1.11
Conflicts:
sites/www/changelog.rst
| -rw-r--r-- | dev-requirements.txt | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt index 9fa05df9..89469175 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -7,4 +7,4 @@ invoke>=0.7.0 invocations>=0.4.4 sphinx>=1.1.3 alabaster>=0.3.0 -releases>=0.2.4 +releases>=0.5.0 diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index f7e5b11b..1c533f95 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -14,10 +14,10 @@ Changelog to Nathan Scowcroft for the patch & Martin Blumenstingl for the initial test case. * :release:`1.11.2 <2013-09-27>` -* :release:`1.10.4 <2013-09-27>` 199, 200, 179 -* :bug:`156` Fix potential deadlock condition when using Channel objects as - sockets (e.g. when using SSH gatewaying). Thanks to Steven Noonan and Frank - Arnold for catch & patch. +* :release:`1.10.4 <2013-09-27>` +* :bug:`156 (1.11+)` Fix potential deadlock condition when using Channel + objects as sockets (e.g. when using SSH gatewaying). Thanks to Steven Noonan + and Frank Arnold for catch & patch. * :bug:`179` Fix a missing variable causing errors when an ssh_config file has a non-default AddressFamily set. Thanks to Ed Marshall & Tomaz Muraus for catch & patch. |