From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 8 May 2015 07:44:11 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_31~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17410732abf5975d6e714a40eb9dd0227b255b3e;p=thirdparty%2Fntp.git

merge cleanup

bk: 554c694bt8qsnmd7XUJvqa6E8H-beA
---

diff --git a/ChangeLog b/ChangeLog
index 5ebfeeb15..1f69e33f8 100644
--- 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>