[Bug 1518] Windows ntpd should lock to one processor more

  conservatively.
[Bug 1522] Enable range syntax "trustedkey (301 ... 399)".

covers previous two merges

bk: 4bbff0b48O1ef16uYuf4Vpmi-KvyUQ

diff --git a/ChangeLog b/ChangeLog
index a391f0a28bcb5954daa4e6b81dde342f2538bedc..7e2eaf0fd690e6d6657c9e36bad3ee83aeb75702 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+* [Bug 1518] Windows ntpd should lock to one processor more
+  conservatively.
+* [Bug 1522] Enable range syntax "trustedkey (301 ... 399)".
 (4.2.7p23) 2010/04/04 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1516] unpeer by IP address fails, DNS name works.
 * [Bug 1517] ntpq and ntpdc should verify reverse DNS before use.