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

Merge branch '1.10' 

Conflicts:
	NEWS
	setup.py
This commit is contained in:
Jeff Forcier 2013-07-26 15:06:58 -07:00
parent caf94786ca 965d00dee9
commit d2c71ed999
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
NEWS
View File

@ -12,8 +12,8 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/.
Releases Releases
======== ========
v1.11.0 (DD MM YYYY) v1.11.0 (26th Jul 2013)
-------------------- -----------------------
* #98: On Windows, when interacting with the PuTTY PAgeant, Paramiko now * #98: On Windows, when interacting with the PuTTY PAgeant, Paramiko now
creates the shared memory map with explicit Security Attributes of the user, creates the shared memory map with explicit Security Attributes of the user,
@ -29,11 +29,11 @@ v1.11.0 (DD MM YYYY)
against duplicate entries during subsequent `known_hosts` loads.) Thanks to against duplicate entries during subsequent `known_hosts` loads.) Thanks to
`@sunweaver` for the contribution. `@sunweaver` for the contribution.
v1.10.2 (DD MM 2013) v1.10.2 (26th Jul 2013)
-------------------- -----------------------
* #153, #67: Warn on parse failure when reading known_hosts * #153, #67: Warn on parse failure when reading known_hosts file. Thanks to
file. Thanks to `@glasserc` for patch. `@glasserc` for patch.
* #146: Indentation fixes for readability. Thanks to Abhinav Upadhyay for catch * #146: Indentation fixes for readability. Thanks to Abhinav Upadhyay for catch
& patch. & patch.

2
paramiko/__init__.py
View File

@ -57,7 +57,7 @@ if sys.version_info < (2, 5):
__author__ = "Jeff Forcier <jeff@bitprophet.org>" __author__ = "Jeff Forcier <jeff@bitprophet.org>"
__version__ = "1.10.1" __version__ = "1.10.2"
__license__ = "GNU Lesser General Public License (LGPL)" __license__ = "GNU Lesser General Public License (LGPL)"

4
setup.py
View File

@ -52,7 +52,11 @@ if sys.platform == 'darwin':
setup(name = "paramiko", setup(name = "paramiko",
<<<<<<< HEAD
version = "1.11.0", version = "1.11.0",
=======
version = "1.10.2",
>>>>>>> 1.10
description = "SSH2 protocol library", description = "SSH2 protocol library",
author = "Jeff Forcier", author = "Jeff Forcier",
author_email = "jeff@bitprophet.org", author_email = "jeff@bitprophet.org",