summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-12-17 16:01:23 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-12-17 16:01:23 -0800
commit8e1417f9494d6806ce875e8a4c127beb37217d8a (patch)
tree2fd0892a200810abd16b46968dd12174c5be3f33 /sites/www
parent0a73a54c745c2102b74f0e40514692448e942fec (diff)
parentcca8c511f69e355bdce1534c6091d5c65e7f114c (diff)
Merge branch '1.14' into 1.15
Conflicts: sites/www/changelog.rst
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 9c2e2a0f..9603e6d5 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,10 @@
Changelog
=========
+* :bug:`428` Fix an issue in `~paramiko.file.BufferedFile` (primarily used in
+ the SFTP modules) concerning incorrect behavior by
+ `~paramiko.file.BufferedFile.readlines` on files whose size exceeds the
+ buffer size. Thanks to ``@achapp`` for catch & patch.
* :bug:`415` Fix ``ssh_config`` parsing to correctly interpret ``ProxyCommand
none`` as the lack of a proxy command, instead of as a literal command string
of ``"none"``. Thanks to Richard Spiers for the catch & Sean Johnson for the