summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2012-09-23 14:01:57 -0700
committerJeff Forcier <jeff@bitprophet.org>2012-09-24 19:00:19 -0700
commitdd6fb2577d1c6f5cbfaf0264cc0452f465b0ca63 (patch)
tree630e9fcc7688d51e61e53ee3547545ff907a2373
parent3c01fdda1457b8c3ebc5bd7b0552584b9c786f32 (diff)
downloadparamiko-dd6fb2577d1c6f5cbfaf0264cc0452f465b0ca63.tar.gz
Bump to 0.8.x due to nontrivial changesinitial-merge-from-ssh-done
(cherry picked from commit d7def60c4784fed39fc8714753304a150da131c7) Conflicts: setup.py
-rw-r--r--paramiko/__init__.py2
-rw-r--r--setup.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 9f2a8af5..7935f830 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -60,7 +60,7 @@ if sys.version_info < (2, 2):
__author__ = "Jeff Forcier <jeff@bitprophet.org>"
-__version__ = "1.7.14"
+__version__ = "1.8.0"
__license__ = "GNU Lesser General Public License (LGPL)"
diff --git a/setup.py b/setup.py
index edd582c5..96ed883a 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ if sys.platform == 'darwin':
setup(name = "paramiko",
- version = "1.7.14",
+ version = "1.8.0",
description = "SSH2 protocol library",
author = "Jeff Forcier",
author_email = "jeff@bitprophet.org",