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

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

bk: 55410f1aF8fwV-iupOl85vzdIssa0Q
---

73b38027cb8a703df949e693aec8effa4765e4f6
diff --cc ChangeLog
index 6ddd56803,5ddb578ed..5efed602e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,8 +1,11 @@@
  ---
  
 +* [Bug 2808] GPSD_JSON driver enhancements, step 1
 +  fix coverity issues with refclock_gpsdjson and refclock_shm
- * [Bug 2808] GPSD_JSON driver enhancements, step 1.
 +  Add a few more tallies as per Hal Murray's suggestions
+ * 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.