From: Dave Hart <hart@ntp.org>
Date: Sat, 3 Oct 2009 05:59:22 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P226~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51ceb86e6ad2d7bc7c21437feeb39ad3d28438d3;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1318-27

bk: 4ac6e83aozj_-i_63dmbsp1xLKKTXA
---

51ceb86e6ad2d7bc7c21437feeb39ad3d28438d3
diff --cc ChangeLog
index 99f843c3e,b0b4c2b06..97b438c43
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,5 +1,10 @@@
 +[Bug 1318] Allow multiple -g options on ntpd command line.
 +[Bug 1327] ntpq, ntpdc, ntp-keygen -d and -D should work with configure
 +  --disable-debugging.
 +* Add ntpd --saveconfigquit <filename> option for future build-time
 +  testing of saveconfig fidelity.
+ * Clockhop and autokey cleanup from Dave Mills.
+ * Documentation updates from Dave Mills.
  (4.2.5p225) 2009/09/30 Released by Harlan Stenn <stenn@ntp.org>
  * authopt documentation changes from Dave Mills/Dave Hart.
  * [Bug 1324] support bracketed IPv6 numeric addresses for restrict.