From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 1 Mar 2014 08:43:13 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P427~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ea062e0e060fd62409d6d9a59978d24cd400201;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-gpsd

bk: 53119da13fggFaZor9n6J4bh73WCgA
---

8ea062e0e060fd62409d6d9a59978d24cd400201
diff --cc ChangeLog
index e9a132218,add1cf205..66ba2efde
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,9 +1,10 @@@
 +* [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.