summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-25 14:33:49 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-25 14:33:49 -0700
commita75735b351afd0d76a131bcd9b860afc426d609a (patch)
tree8df99438dd129f874ec77d33811081458dbc75c8
parent48ec43b2009ca5fd8b417849fa73af20b43d1c18 (diff)
parent9fe9feacb85aa9cf8ad6a694b331208720723444 (diff)
Merge branch '1.16' into 1.17
-rw-r--r--sites/www/changelog.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 6e966f99..6065378e 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :release:`1.16.1 <2016-04-25>`
+* :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