From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 11 Apr 2020 09:34:25 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/burnicki/ntp-stable-3662
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=085676aa81d4965acbc59bd9b12cccfaa84c2c40;p=thirdparty%2Fntp.git

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

bk: 5e918f21pDUAh1DwIGSkGIKf7q9Djg
---

085676aa81d4965acbc59bd9b12cccfaa84c2c40
diff --cc ChangeLog
index ed6cfb98d,da9057a91..77312f1dc
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,4 +1,16 @@@
 -* [Bug 3662] Fix build errors on Windows with VS2008.
 +---
 +(4.2.8p15) 2020/04/xx Released by Harlan Stenn <stenn@ntp.or>
 +
++* [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>