dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '1.10' into 1.11 

Conflicts:
	sites/www/changelog.rst
This commit is contained in:
Jeff Forcier 2014-02-11 14:23:50 -08:00
parent 36b937d436 c142454621
commit 41d7339992
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-requirements.txt
View File

@ -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

8
sites/www/changelog.rst
View File

@ -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.