From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 9 Aug 2014 08:59:42 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P457~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a8315e9b911d767d8487becd603b03594f3b2ca;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/perlinger/ntp-dev-2622

bk: 53e5e2feUGjImzCZHITlxitx30v21w
---

7a8315e9b911d767d8487becd603b03594f3b2ca
diff --cc ChangeLog
index 78f79dfa7,e576c14d9..0f1cf5404
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,10 @@@
+ * [Bug 2622] Synchronisation problem using SHM when time difference is
+   more than four hours: Change SHM driver so TOY restricted API is not
+   used any more. (Plus some minor cleanup in logic and flow control)
 +* Pass the configration source into the parser as argument rather
 +  than through a global variable.
 +* Fix nits in the ntpq man page.
 +* autogen-5.18.4pre14
  (4.2.7p456) 2014/08/07 Released by Harlan Stenn <stenn@ntp.org>
  * CID 739722: Change the way the extention and MAC fields are processed.
  (4.2.7p455) 2014/08/03 Released by Harlan Stenn <stenn@ntp.org>