From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 24 Jun 2015 15:54:12 +0000 (-0700)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_2_8P3~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c188f17530e015afe68dc4309e7b3986d7b44bd;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-stable
into  hms-mbp11.pfcs.com:/Users/harlan/src/ntp-stable-2853

bk: 558ad2a4Yb32Pel_Vuy25QgniZnpFA
---

2c188f17530e015afe68dc4309e7b3986d7b44bd
diff --cc ChangeLog
index c79913569,11543bb6d..649de7dbd
--- a/ChangeLog
+++ b/ChangeLog
@@@ -24,9 -23,8 +24,10 @@@
     (The original topic was fixed in a byplay to bug#2830)
  * [Bug 2845] Harden memory allocation in ntpd.
  * [Bug 2852] 'make check' can't find unity.h.  Hal Murray.
+ * [Bug 2853] FICORA #829967
  * [Bug 2854] Missing brace in libntp/strdup.c.  Masanari Iida.
 +* [Bug 2855] Implement conditional leap smear code.  Martin Burnicki.
 +* [Bug 2855] leap smear cleanup.  Harlan Stenn.
  * Initial support for experimental leap smear code.  Harlan Stenn.
  * Fixes to sntp/tests/fileHandlingTest.h.in.  Harlan Stenn.
  * Report select() debug messages at debug level 3 now.