From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 20 Apr 2020 08:09:51 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/burnicki/ntp-stable-3664
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7466445042637d5ab13e939c461e4a51542f65c;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/burnicki/ntp-stable-3664
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15-3664

bk: 5e9d58cfb9eHpnBeezeitKkVfXsZFQ
---

d7466445042637d5ab13e939c461e4a51542f65c
diff --cc ChangeLog
index 77312f1dc,ea75dcff8..1d73893e9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,4 +1,17 @@@
 -* [Bug 3664] Enable openSSL CMAC support on Windows.
 +---
 +(4.2.8p15) 2020/04/xx Released by Harlan Stenn <stenn@ntp.or>
 +
++* [Bug 3664] Enable openSSL CMAC support on Windows <burnicki@ntp.org>
 +* [Bug 3662] Fix build errors on Windows with VS2008 <burnicki@ntp.org>
 +* [Bug 3659] Move definition of psl[] from ntp_config.h to
 +  ntp_config.h <perlinger@ntp.org>
 +* [Bug 3657] Wrong "Autokey group mismatch" debug message <perlinger@ntp.org>
 +* [Bug 3655] ntpdc memstats hash counts <perlinger@ntp.org>
 +  - fix by Gerry garvey
 +* [Bug 3653] Refclock jitter RMS calculation <perlinger@ntp.org>
 +  - thanks to Gerry Garvey
 +* [Bug 3646] Avoid sync with unsync orphan <perlinger@ntp.org>
 +  - patch by Gerry Garvey
  
  ---
  (4.2.8p14) 2020/03/03 Released by Harlan Stenn <stenn@ntp.org>