From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 27 Jun 2015 18:22:58 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_2_8P3~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=154368cf0d66f903fdbc66e46ae4f0b19c6ff790;p=thirdparty%2Fntp.git

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

bk: 558eea02Ijgj1_8F4AYTmVe2Qm7G1Q
---

154368cf0d66f903fdbc66e46ae4f0b19c6ff790
diff --cc ChangeLog
index 1e2851957,33792dbd6..766b4db58
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,10 @@@
  ---
 +
 +* [Sec 2853] FICORA #829967.  Juergen Perlinger, Harlan Stenn.
 +* [Sec 2853] Initial work on tests/sec-2853/.  Harlan Stenn.
++---
+ (4.2.8p3-RC3) 2015/06/27 Released by Harlan Stenn <stenn@ntp.org>
+ 
  * [Bug 2855] Parser fix for conditional leap smear code.  Harlan Stenn.
  * [Bug 2855] Report leap smear in the REFID.  Harlan Stenn.
  * [Bug 2856] ntpd should wait() on terminated child processes.  Paul Green.