From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 8 Apr 2020 11:35:58 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3653
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dee5dcfd9bda7d618388ad34212cb75f92cb0e4;p=thirdparty%2Fntp.git

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

bk: 5e8db71exJuurPbowV3n-OJAkVWdSw
---

4dee5dcfd9bda7d618388ad34212cb75f92cb0e4
diff --cc ChangeLog
index 853f8657d,a90ba834a..732e7ebad
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,8 @@@
  ---
 +* [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>