From d3b48e9b44786154954435b3d5e538fa6553e822 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 18 Nov 2011 08:56:12 -0800 Subject: [PATCH] Bump to 1.7.11 (cherry picked from commit 9234baed01df9ca3ac59920ae6f98808b7ca5213) Conflicts: paramiko/__init__.py setup.py --- paramiko/__init__.py | 8 ++------ setup.py | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 8018aca..08384d9 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -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 " -__version__ = "1.8.0a0" +__version__ = "1.7.11" __license__ = "GNU Lesser General Public License (LGPL)" diff --git a/setup.py b/setup.py index e48831e..c085e47 100644 --- a/setup.py +++ b/setup.py @@ -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",