From: Juergen Perlinger <perlinger@ntp.org>
Date: Sun, 2 Mar 2014 08:51:02 +0000 (-0800)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P427~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8190a16272c4ac1dc6eab1ae7e0d8cb06c7a2663;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-os1.ntp.org:/home/perlinger/ntp-dev-gpsd

bk: 5312f0f60FPmLjaqULzEMoDNyuqAFA
---

8190a16272c4ac1dc6eab1ae7e0d8cb06c7a2663
diff --cc ChangeLog
index 66ba2efde,e3fb65e86..19678212f
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,5 +1,11 @@@
+ * [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.
 +* [Bug 2540] bootstrap script needs to 'touch' files in finer-grained groups.
 +* [Bug 2561] Allow wildcards in the target of the "interface" command.
 +* [Bug 2572] cross-compiling fails for --with-yielding_select.
 +(4.2.7p425) 2014/02/26 Released by Harlan Stenn <stenn@ntp.org>
  * Copyright file update.
  (4.2.7p424) 2014/02/24 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2541] ntpd terminates itself with SIGHUP unexpectedly.