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

Bump to 1.7.11 

(cherry picked from commit 9234baed01)

Conflicts:
	paramiko/__init__.py
	setup.py
This commit is contained in:
Jeff Forcier 2011-11-18 08:56:12 -08:00
parent 10beb86e9e
commit d3b48e9b44
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
paramiko/__init__.py
View File

@ -45,16 +45,12 @@ receive data over the encrypted session.
Paramiko is written entirely in python (no C or platform-dependent code) and is
released under the GNU Lesser General Public License (LGPL).
<<<<<<< HEAD:paramiko/__init__.py
Website: U{http://www.lag.net/paramiko/}
@version: 1.7.8
@version: 1.7.11
@author: Robey Pointer
@contact: robeypointer@gmail.com
@license: GNU Lesser General Public License (LGPL)
=======
Website: U{http://www.lag.net/ssh/}
>>>>>>> 01eea33... Let's not have 5 different freakin version strings:ssh/__init__.py
"""
import sys
@ -64,7 +60,7 @@ if sys.version_info < (2, 2):
__author__ = "Jeff Forcier <jeff@bitprophet.org>"
__version__ = "1.8.0a0"
__version__ = "1.7.11"
__license__ = "GNU Lesser General Public License (LGPL)"

2
setup.py
View File

@ -50,7 +50,7 @@ if sys.platform == 'darwin':
setup(name = "paramiko",
version = "1.7.10"
version = "1.7.11"
description = "SSH2 protocol library",
author = "Jeff Forcier",
author_email = "jeff@bitprophet.org",