From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 29 Jun 2015 03:17:41 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable-unity
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be3012da88860710d347de9c10d55d919f0458cd;p=thirdparty%2Fntp.git

Merge psp-at1.ntp.org:/home/stenn/ntp-stable-unity
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/tflendrich/changelog/ntp-stable-unity

bk: 5590b8d5zCTECCVxaglmd5enUmukbg
---

be3012da88860710d347de9c10d55d919f0458cd
diff --cc ChangeLog
index 527dcb745,87e925618..d1f44c5c3
--- a/ChangeLog
+++ b/ChangeLog
@@@ -4,9 -4,7 +4,10 @@@
  * [Bug 2846] Report 'unsynchronized' status during the leap second.
    Fixed in Martin's changes to Bug 2855.  Martin Burnicki.
  * [Bug 2859] Improve raw DCF77 robustness deconding.  Frank Kardel.
 -* tests/libntp/msyslog.c: fixed a gcc warning. Tomasz Flendrich
 +* [Bug 2860] ntpq ifstats sanity check is too stringent.  Frank Kardel.
 +* README.leapsmear added.  Martin Burnicki.
 +* README.leapsmear edited.  Harlan Stenn.
++* tests/libntp/msyslog.c: fixed a gcc warning. Tomasz Flendrich.
  ---
  (4.2.8p3-RC3) 2015/06/27 Released by Harlan Stenn <stenn@ntp.org>