summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-08-25 22:32:25 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-08-25 22:32:25 -0700
commita22bf77030acaa476512752a2862244e90a3f1b6 (patch)
treee55068f63c9bc3e8f60b7d6b020411670f7fc022 /sites/www
parentce1ec358abbd1726f39df9b19d6e4e681819abb9 (diff)
parent5fc6969e23ec5e013f432e4efbe12d771150c1e1 (diff)
Merge branch '1.13' into 1.14
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 81195a49..5b8e1702 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,10 @@
Changelog
=========
+* :support:`229` Fix a couple of incorrectly-copied docstrings' ``..
+ versionadded::`` RST directives. Thanks to Aarni Koskela for the catch.
+* :support:`169 backported` Minor refactor of
+ `paramiko.sftp_client.SFTPClient.put` thanks to Abhinav Upadhyay.
* :bug:`285` (also :issue:`352`) Update our Python 3 ``b()`` compatibility shim
to handle ``buffer`` objects correctly; this fixes a frequently reported
issue affecting many users, including users of the ``bzr`` software suite.