summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2015-11-03 15:40:41 -0800
committerJeff Forcier <jeff@bitprophet.org>2015-11-03 15:40:41 -0800
commit6e443b75c8d3b0c6399ce2fbcf8a2cdb251dcaad (patch)
treed217b247f29fe71738c69410ac7006ccccb33260 /sites
parentd37c68673396b247c08d0d5122bb012e9c3c46c3 (diff)
parent5e6dc69e783291a500631bac3c6b026b6b6d9baa (diff)
Merge branch '1.14' into 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 fe4b2b2d..096b0ae7 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>`