summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2015-11-03 15:39:28 -0800
committerJeff Forcier <jeff@bitprophet.org>2015-11-03 15:39:28 -0800
commit5e6dc69e783291a500631bac3c6b026b6b6d9baa (patch)
treec0b9d4b91b631a9923d6bf7fef513331971a13ff /sites
parent79bdefe35610b651566bb7422518fb60b3f72bdd (diff)
parent3a5227c477295c8e14e395d3ac66e9a58db0ebc8 (diff)
Merge branch '1.13' into 1.14
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 7a140e38..c1705755 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,12 @@
Changelog
=========
+* :bug:`401` Fix line number reporting in log output regarding invalid
+ ``known_hosts`` line entries. Thanks to Dylan Thacker-Smith for catch &
+ patch.
+* :support:`525 backported` Update the vendored Windows API addon to a more
+ recent edition. Also fixes :issue:`193`, :issue:`488`, :issue:`498`. Thanks
+ to Jason Coombs.
* :release:`1.14.3 <2015-11-02>`
* :release:`1.13.4 <2015-11-02>`
* :bug:`366` Fix `~paramiko.sftp_attributes.SFTPAttributes` so its string