From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 11 Apr 2020 07:04:19 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3655
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a18d70f3e0591f26aea1b3d437f599eb4c1a36f8;p=thirdparty%2Fntp.git

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

bk: 5e916bf3-I_zImqxOVI6ks0_NjpcIQ
---

a18d70f3e0591f26aea1b3d437f599eb4c1a36f8
diff --cc ChangeLog
index d109dca9f,732e7ebad..0c5a89ec1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,8 +1,12 @@@
  ---
++*4.2.8p15) 2020/04/xx Released by Harlan Stenn <stenn@ntp.or>
++
 +* [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>