From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 9 May 2007 20:37:13 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P30~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d7b94fd3ee04d0a14079be2fb670b2611e90b57;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/kamboj/new-config-bk-repo

bk: 464230f99M1LhkRFGWhUdWiem4DeJA
---

3d7b94fd3ee04d0a14079be2fb670b2611e90b57
diff --cc ChangeLog
index 66dcc16c6,b68684c99..68d53bc7c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
 +* New config file parsing code, from Sachin Kamboj.
+ * fuzz bit cleanup from Dave Mills.
+ * replay cleanup from Dave Mills.
  * [Bug 542] Tolerate missing directory separator at EO statsdir.
  * [Bug 812] ntpd should drop supplementary groups.
  * [Bug 815] Fix warning compiling 4.2.5p22 under Windows with VC6.