summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2015-11-03 15:40:44 -0800
committerJeff Forcier <jeff@bitprophet.org>2015-11-03 15:40:44 -0800
commit16c106e6aac64424b554b33d269eee80ebb1db7a (patch)
treeffb4fce9aac504ee36f55fbee946fa89d98b8efb /sites
parent2688100402a949816be9019e84cc6877693fc6ce (diff)
parent6e443b75c8d3b0c6399ce2fbcf8a2cdb251dcaad (diff)
Merge branch '1.15'
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 b2472e44..bd748610 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.15.4 <2015-11-02>`
* :release:`1.14.3 <2015-11-02>`
* :release:`1.13.4 <2015-11-02>`