merge cleanup

bk: 554c694bt8qsnmd7XUJvqa6E8H-beA

diff --git a/ChangeLog b/ChangeLog
index 5ebfeeb151175db11d3e23a8b48ee09069cb316c..1f69e33f86fcc1572ae9c8043c5c2cc277009890 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 Below are from 4.2.8p3:
+* [Bug 2808] GPSD_JSON driver enhancements, step 1.
+  Increase internal token buffer to parse all JSON data, even SKY.
+  Defer logging of errors during driver init until the first unit is
+  started, so the syslog is not cluttered when the driver is not used.
 * Add an assert to the ntpq ifstats code.
 * Clean up the RLIMIT_STACK code.
 (4.3.30) 2015/05/07 Released by Harlan Stenn <stenn@ntp.org>