summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-25 14:30:27 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-25 14:30:27 -0700
commit34775cfb67d85d84d35fbd28c84245aea8de82ca (patch)
tree1e2e505a497bb4ce28905f7addb62825bcae7238 /sites
parent3b8ebc9292f22aaeeb3979260cd91a2969fff166 (diff)
parent9b01487407b6d604e4424197954ff362ae1c9fb3 (diff)
Merge branch '1.15' into 1.16
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 0371e137..83c61eeb 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+* :release:`1.15.5 <2016-04-25>`
* :bug:`676` (via :issue:`677`) Fix a backwards incompatibility issue that
cropped up in `SFTPFile.prefetch <~paramiko.sftp_file.prefetch>` re: the
erroneously non-optional ``file_size`` parameter. Should only affect users