From: Dave Hart <hart@ntp.org>
Date: Wed, 7 Dec 2011 23:17:43 +0000 (+0000)
Subject: Correct ChangeLog merge to duplicate -stable entries in -dev section.
X-Git-Tag: NTP_4_2_7P238~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=201a441e73f75979f94ce66f36625be29e0ebb70;p=thirdparty%2Fntp.git

Correct ChangeLog merge to duplicate -stable entries in -dev section.

bk: 4edff417NJMK4olJEWT7FDqB8WpaHg
---

diff --git a/ChangeLog b/ChangeLog
index 2bc3d6198..0a59174f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 * [Bug 2082] from 4.2.6p5-RC3: 3-char refid sent by ntpd 4.2.6p5-RC2
   ends with extra dot.
+* [Bug 2085] from 4.2.6p5-RC3: clock_update() sys_rootdisp calculation
+  omits root delay.
+* [Bug 2086] from 4.2.6p5-RC3: get_systime() should not offset by
+  sys_residual.
+* [Bug 2087] from 4.2.6p5-RC3: sys_jitter calculation overweights
+  sys.peer jitter.
 * from 4.2.6p5-RC3: Ensure NULL peer->dstadr is not accessed in orphan
   parent selection.
 (4.2.7p237) 2011/12/01 Released by Harlan Stenn <stenn@ntp.org>