summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-04-16 15:24:04 -0400
committerJeff Forcier <jeff@bitprophet.org>2014-04-16 15:24:04 -0400
commitba017e9e6c0fd870d37c83a4bba49c08c125a0ab (patch)
tree61c2dbba354ae82f0a987d89ae3dfb8d66c65b4d /sites/www
parent6dee34648ed7d910464c7f2bbc27f361c9fe6d71 (diff)
parenta0b2ae293ffedcad45883e8a4d04fc067f919d15 (diff)
Merge branch '1.12' into 1.13
Conflicts: paramiko/sftp_client.py sites/www/changelog.rst tests/test_sftp.py
Diffstat (limited to 'sites/www')
-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 6737fdc0..25eaacf3 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :bug:`-` Fix logging error in sftp_client for filenames containing the '%'
+ character. Thanks to Antoine Brenner.
* :bug:`308` Fix regression in dsskey.py that caused sporadic signature
verification failures. Thanks to Chris Rose.
* :support:`290` (also :issue:`292`) Add support for building universal