From: Juergen Perlinger <perlinger@ntp.org>
Date: Thu, 7 May 2015 18:49:15 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_2_8P3_RC1~2^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac1af98b3095f3305b753c3f385e3b3048d2d124;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-stable
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/perlinger/ntp-stable-2745

bk: 554bb3abWVs_hZHOfb_q1yaXVIJXlg
---

ac1af98b3095f3305b753c3f385e3b3048d2d124
diff --cc ChangeLog
index 30372087b,676a90e00..76e44110e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,11 +1,17 @@@
  ---
  
 -* CID 1269537: Clean up a line of dead code in getShmTime().
 -* [Bug 2612] restrict: Warn when 'monitor' can't be disabled because
 -  of 'limited'.
+ * [Bug 2745] ntpd -x steps clock on leap second 
+    Do leap second stepping only of the step adjustment is beyond the
+    proper jump distance limit and step correction is allowed at all. 
 +* CID 1295478: Quiet a pedantic potential error from the fix for Bug 2776.
 +* CID 1296235: Fix refclock_jjy.c and correcting type of the driver40-ja.html
 +* CID 1269537: Clean up a line of dead code in getShmTime().
 +* [Bug 2590] autogen-5.18.5.
 +* [Bug 2612] restrict: Warn when 'monitor' can't be disabled because
 +  of 'limited'.
 +* [Bug 2650] fix includefile processing.
 +* [Bug 2776] Improve ntpq's 'help keytype'.
 +* [Bug 2782] Refactor refclock_shm.c, add memory barrier protection.
  * [Bug 2794] Clean up kernel clock status reports.
  * [Bug 2800] refclock_true.c true_debug() can't open debug log because
    of incompatible open/fdopen parameters.