From: Juergen Perlinger <perlinger@ntp.org>
Date: Sat, 1 Aug 2015 08:53:57 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_3_69~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11b4b01e59ac473056c39d08fde8acdabc288c1f;p=thirdparty%2Fntp.git

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

bk: 55bc8925ebllCnnf-X2wDwqoejd_fQ
---

11b4b01e59ac473056c39d08fde8acdabc288c1f
diff --cc ChangeLog
index e33fbd4e2,d64e505a4..8393ccf66
--- a/ChangeLog
+++ b/ChangeLog
@@@ -2,6 -2,6 +2,7 @@@
  * [Bug 2595] ntpdate man page quirks.  Hal Murray, Harlan Stenn.
  * [Bug 2625] Deprecate flag1 in local refclock.  Hal Murray, Harlan Stenn.
  * [Bug 2817] Stop locking ntpd into memory by default under Linux.  H.Stenn.
++* [Bug 2821] minor build issues: fixed refclock_gpsdjson.c.  perlinger@ntp.org
  * [Bug 2823] ntpsweep with recursive peers option doesn't work.  H.Stenn.
  * [Bug 2849] Systems with more than one default route may never
    synchronize.  Brian Utterback.  Note that this patch might need to