From: Juergen Perlinger <perlinger@ntp.org>
Date: Wed, 29 Apr 2015 17:35:08 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_3_24~1^2^2~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e250e74b4fdc47fb6c07f63e19e42efaf3d82ae1;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-stable
into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-2745

bk: 5541164c9BHQTg0_OtMxhEdrqoQPNw
---

e250e74b4fdc47fb6c07f63e19e42efaf3d82ae1
diff --cc ChangeLog
index 0873beb0a,5ddb578ed..c20ddc9ff
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,11 +1,14 @@@
  ---
  
 +* [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 1269537: Clean up a line of dead code in getShmTime().
+ * [Bug 2612] restrict: Warn when 'monitor' can't be disabled because
+   of 'limited'.
  * [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.
  * [Bug 2804] install-local-data assumes GNU 'find' semantics.
  * [Bug 2808] GPSD_JSON driver enhancements, step 1.
    Various improvements, see http://bugs.ntp.org/2808 for details.