From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 4 Oct 2009 22:45:28 +0000 (-0400)
Subject: Merge bk://maccarony/ntp-dev
X-Git-Tag: NTP_4_2_5P227~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d7459b3e9e61f271b71e69de7556600d7e9d26c;p=thirdparty%2Fntp.git

Merge bk://maccarony/ntp-dev
into  pogo.udel.edu:/pogo/users/hart/ntp-dev-1330

bk: 4ac92588H4JvePtuakmAoS5psysYCw
---

1d7459b3e9e61f271b71e69de7556600d7e9d26c
diff --cc ChangeLog
index 986ee9c8c,8d250ea30..6ef0a9e8d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,10 @@@
 +* [Bug 1330] disallow interface/nic rules when --novirtualips or
 +  --interface are used.
 +* Add test of ntpd --saveconfigquit fidelity using new complete.conf.
+ * Documentation updates from Dave Hart/Dave Mills.
  (4.2.5p226) 2009/10/04 Released by Harlan Stenn <stenn@ntp.org>
 -[Bug 1318] Allow multiple -g options on ntpd command line.
 -[Bug 1327] ntpq, ntpdc, ntp-keygen -d and -D should work with configure
 +* [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.