summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2013-09-27 21:57:42 -0700
committerJeff Forcier <jeff@bitprophet.org>2013-09-27 21:57:42 -0700
commit48c67e24e092a2d117ef37361146e85ea3228b2f (patch)
treee0b2bdf66109b71c9841d09c928d39b52afdd4ef
parent28d78e4e6a33d2e23af196db632e6eeda4167e24 (diff)
parentceb39683dc3a5326b090edec855366e4dfe70887 (diff)
Merge branch '1.11'
-rw-r--r--NEWS9
1 files changed, 9 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 2c997d28..4a3a672c 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,13 @@ v1.11.2 (27th Sep 2013)
* #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.
+* #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.
+* #200: Fix an exception-causing typo in `demo_simple.py`. Thanks to Alex
+ Buchanan for catch & Dave Foster for patch.
+* #199: Typo fix in the license header cross-project. Thanks to Armin Ronacher
+ for catch & patch.
v1.10.4 (27th Sep 2013)
-----------------------
@@ -41,6 +48,8 @@ v1.10.4 (27th Sep 2013)
& patch.
* #200: Fix an exception-causing typo in `demo_simple.py`. Thanks to Alex
Buchanan for catch & Dave Foster for patch.
+* #199: Typo fix in the license header cross-project. Thanks to Armin Ronacher
+ for catch & patch.
v1.11.1 (20th Sep 2013)
-----------------------