summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2012-05-16 16:03:10 -0700
committerJeff Forcier <jeff@bitprophet.org>2012-05-16 16:03:10 -0700
commit322819454ddd3cc83a0c9ad591186997a8cb1ab2 (patch)
tree9b4b18702c47f003a73d80be3d57f17638311d6c
parenta6358f8d131b2c29babc82fc3d97cd3178d9638d (diff)
Increment version for release
-rw-r--r--Makefile1
-rw-r--r--NEWS5
-rw-r--r--README4
-rw-r--r--paramiko/__init__.py6
-rw-r--r--paramiko/transport.py2
-rw-r--r--setup.py2
6 files changed, 13 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 1815a8ac..78ca4b2b 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@
# ernest (19jul09) - 1.7.5
# fanny (1nov09) - 1.7.6
# george (21may11) - 1.7.7.1
+# 16 May 2012 - 1.7.7.2
ifeq ($(wildcard /sbin/md5),/sbin/md5)
diff --git a/NEWS b/NEWS
index 7bedcb57..87019f98 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,11 @@ Highlights of what's new in each release:
Releases
========
+v1.7.7.2 16may12
+----------------
+ * Merge pull request #63: https://github.com/paramiko/paramiko/pull/63 which
+ fixes exceptions that occur when re-keying over fast connections.
+
v1.7.7.1 (George) 21may11
-------------------------
* Make the verification phase of SFTP.put optional (Larry Wright)
diff --git a/README b/README
index f977c6de..2d02430b 100644
--- a/README
+++ b/README
@@ -9,10 +9,10 @@ paramiko
:Homepage: http://www.lag.net/paramiko/
-paramiko 1.7.7.1
+paramiko 1.7.7.2
================
-"George" release, 21 may 2011
+Release of 16 May 2012
What
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 96b5943f..e8e55a44 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -47,7 +47,7 @@ released under the GNU Lesser General Public License (LGPL).
Website: U{http://www.lag.net/paramiko/}
-@version: 1.7.7.1 (George)
+@version: 1.7.7.2
@author: Robey Pointer
@contact: robeypointer@gmail.com
@license: GNU Lesser General Public License (LGPL)
@@ -60,8 +60,8 @@ if sys.version_info < (2, 2):
__author__ = "Robey Pointer <robeypointer@gmail.com>"
-__date__ = "21 May 2011"
-__version__ = "1.7.7.1 (George)"
+__date__ = "16 May 2012"
+__version__ = "1.7.7.2"
__version_info__ = (1, 7, 7, 1)
__license__ = "GNU Lesser General Public License (LGPL)"
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 30de295b..d87e1e58 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -194,7 +194,7 @@ class Transport (threading.Thread):
"""
_PROTO_ID = '2.0'
- _CLIENT_ID = 'paramiko_1.7.7.1'
+ _CLIENT_ID = 'paramiko_1.7.7.2'
_preferred_ciphers = ( 'aes128-ctr', 'aes256-ctr', 'aes128-cbc', 'blowfish-cbc', 'aes256-cbc', '3des-cbc',
'arcfour128', 'arcfour256' )
diff --git a/setup.py b/setup.py
index 4537a8ae..c5cb745d 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@ if sys.platform == 'darwin':
setup(name = "paramiko",
- version = "1.7.7.1",
+ version = "1.7.7.2",
description = "SSH2 protocol library",
author = "Robey Pointer",
author_email = "robeypointer@gmail.com",