Merge branch '1.12'

This commit is contained in:
Jeff Forcier 2014-01-08 16:30:00 -08:00
commit 6393175f65
2 changed files with 3 additions and 0 deletions

2
NEWS
View File

@ -18,6 +18,8 @@ v1.12.1 (8th Jan 2014)
* #176: Fix AttributeError bugs in known_hosts file (re)loading. Thanks to * #176: Fix AttributeError bugs in known_hosts file (re)loading. Thanks to
Nathan Scowcroft for the patch & Martin Blumenstingl for the initial test Nathan Scowcroft for the patch & Martin Blumenstingl for the initial test
case. case.
* #225: Note ecdsa requirement in README. Thanks to Amaury Rodriguez for the
catch.
v1.11.3 (8th Jan 2014) v1.11.3 (8th Jan 2014)
---------------------- ----------------------

1
README
View File

@ -36,6 +36,7 @@ Requirements
- python 2.5 or better <http://www.python.org/> - python 2.5 or better <http://www.python.org/>
- pycrypto 2.1 or better <https://www.dlitz.net/software/pycrypto/> - pycrypto 2.1 or better <https://www.dlitz.net/software/pycrypto/>
- ecdsa 0.9 or better <https://pypi.python.org/pypi/ecdsa>
If you have setuptools, you can build and install paramiko and all its If you have setuptools, you can build and install paramiko and all its
dependencies with this command (as root):: dependencies with this command (as root)::