summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-24 22:10:55 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-24 22:10:55 -0700
commit6460ee41a0bfed2498b4a89652cb170783ac442d (patch)
tree0e7bb6cdd6030d99b58716a96d18ec39e59d9a26
parent30dabfffe8f4e41d6d8f75fc7fbef32e55f15983 (diff)
downloadparamiko-6460ee41a0bfed2498b4a89652cb170783ac442d.tar.gz
Cut 1.15.5
-rw-r--r--paramiko/_version.py2
-rw-r--r--sites/www/changelog.rst1
2 files changed, 2 insertions, 1 deletions
diff --git a/paramiko/_version.py b/paramiko/_version.py
index 3b9c059e..c573fd3d 100644
--- a/paramiko/_version.py
+++ b/paramiko/_version.py
@@ -1,2 +1,2 @@
-__version_info__ = (1, 15, 4)
+__version_info__ = (1, 15, 5)
__version__ = '.'.join(map(str, __version_info__))
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 498f809e..cf2f945b 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+* :release:`1.15.5 <2016-04-25>`
* :bug:`577` (via :issue:`578`; should also fix :issue:`718`, :issue:`560`) Fix
stalled/hung SFTP downloads by cleaning up some threading lock issues. Thanks
to Stephen C. Pope for the patch.