summaryrefslogtreecommitdiffhomepage
path: root/sites
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
commit239ee3716fb245ff905110295494f4a7b5c24688 (patch)
treebca8e8b6c5edbb374f62827fa2a6c9c34085ad25 /sites
parent8b2b9450b444bcc739d199977fcf5684e0cfe6bc (diff)
parenta22bf77030acaa476512752a2862244e90a3f1b6 (diff)
Merge branch '1.14'
Diffstat (limited to 'sites')
-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 2e2d2f63..fa85f4c7 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.