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

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

bk: 4bc68716MRSCc7kSP7AbtVUgBDyiQw
---

44632ceddf63e0706feaad96ce26c051a5e71f3c
diff --cc ChangeLog
index 88be0aa1e,47e7db3f8..49f1c68ef
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,11 +1,13 @@@
  ---
  
+ * [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.
  
  ---
+ (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.