From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 2 Mar 2014 09:54:11 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P428~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39456896834cac820acc1dbf3513675078056318;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-deb1.ntp.org:/home/perlinger/ntp-dev-2570

bk: 5312ffc3Un5nT2_-b3dwFGWrMC5W3A
---

39456896834cac820acc1dbf3513675078056318
diff --cc ChangeLog
index 1bc233c67,8334f8566..87d448937
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,6 +1,7 @@@
 +* [Bug 2570] refuse to load leapsec file with bad/missing SHA1 hash
+ * [Bug 2562] Distribute the code in libjsmn/ .
+ (4.2.7p427) 2014/03/02 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 2562] GPSD_JSON: fix solaris issues (asprintf(), isfinite())
  * [Bug 2562] first release of the GPSD client clock (type 46)
  (4.2.7p426) 2014/02/28 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2113] Warn about ignored extra args in ntpq.