]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 27 Jun 2015 18:22:58 +0000 (18:22 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sat, 27 Jun 2015 18:22:58 +0000 (18:22 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2853

bk: 558eea02Ijgj1_8F4AYTmVe2Qm7G1Q

1  2 
ChangeLog

diff --cc ChangeLog
index 1e285195713e5c0e517cda2e17f7695929121859,33792dbd693e6c5d4ba8f7765d7a7a5ed6c3e3cd..766b4db58a1a095d8eeca21c070febf494be1fe6
+++ 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.