From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 23 Jul 2007 05:42:16 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P59~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f9e50250b5cfa741cd14fb9e582cbda6ac52af6;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/mayer/ntp-dev

bk: 46a43fb8fG0FOHqkYhsTscVlxFCX9w
---

7f9e50250b5cfa741cd14fb9e582cbda6ac52af6
diff --cc ChangeLog
index 8647ef58d,289e2054e..acc551052
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,7 @@@
- * [Bug 629] Undo bug #629 fixes as they cause more problems than were  being solved
++* [Bug 629] Undo bug #629 fixes as they cause more problems than were  being
++  solved
+ * Changes from Dave Mills: in/out-bound data rates, leapsecond cleanup,
+   driftfile write cleanup, packet buffer length checks, documentation updates.
  * More assertion checks and malloc()->emalloc(), courtesy of Calysto.
  * [Bug 864] Place ntpd service in maintenance mode if using SMF on Solaris
  * [Bug 862] includefile nesting; preserve phonelist on reconfig.