From 11ca8134a21f5136e882feb660c9fcbb69ef5ad1 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 13 Feb 2012 16:02:00 -0800 Subject: [PATCH] Cut 1.7.13 (cherry picked from commit 998377f353f2f17b6d00e7246ae0ed4628291ffd) Conflicts: setup.py --- CHANGES | 2 +- paramiko/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 796cefc..b9beae2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,6 @@ Temporary, post-Paramiko changelog while we get our sh!t together. -## ssh 1.7.13 (2012-MM-DD) +## ssh 1.7.13 (2012-02-13) * #5: Moved a `fcntl` import closer to where it's used to help avoid `ImportError` problems on Windows platforms. Thanks to Jason Coombs for the diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 734030c..2cf2abe 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -60,7 +60,7 @@ if sys.version_info < (2, 2): __author__ = "Jeff Forcier " -__version__ = "1.7.12" +__version__ = "1.7.13" __license__ = "GNU Lesser General Public License (LGPL)" diff --git a/setup.py b/setup.py index 97770ce..5ac7a0c 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ if sys.platform == 'darwin': setup(name = "paramiko", - version = "1.7.12", + version = "1.7.13", description = "SSH2 protocol library", author = "Jeff Forcier", author_email = "jeff@bitprophet.org",