From: Dave Hart <hart@ntp.org>
Date: Thu, 15 Apr 2010 03:26:03 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1522
X-Git-Tag: NTP_4_2_6P2_RC1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f29e9efdedb5540e545ad76bbf663bdb6beabef;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1522
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1503-04-18-22

bk: 4bc6874bB9ulJQ0lOPDCXS1N-sb45g
---

2f29e9efdedb5540e545ad76bbf663bdb6beabef
diff --cc ChangeLog
index 49f1c68ef,8c7cbebfb..7bf49bcc5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,9 +1,15 @@@
  ---
  
 +* [Bug 1503] Auto-enabling of monitor for "restrict ... limited" wrong.
 +* [Bug 1504] ntpdate tickles ntpd "discard minimum 1" rate limit if
 +  "restrict ... limited" is used.
 +* [Bug 1518] Windows ntpd should lock to one processor more
 +  conservatively.
+ * [Bug 1522] Enable range syntax "trustedkey (301 ... 399)".
+ * Update html/authopt.html controlkey, requestkey, and trustedkey docs.
  
  ---
 +(4.2.6p1) 2010/04/09 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.6p1-RC6) 2010/03/31 Released by Harlan Stenn <stenn@ntp.org>
  
  * [Bug 1514] Typo in ntp_proto.c: fabs(foo < .4) should be fabs(foo) < .4.