From: Dave Hart <hart@ntp.org>
Date: Thu, 22 Apr 2010 15:32:57 +0000 (+0000)
Subject: Merge bk://maccarony.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P26~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac704aa3440c340b7d67eadd90661ab038996fa6;p=thirdparty%2Fntp.git

Merge bk://maccarony.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1531-32

bk: 4bd06c29nmkQXZLEglWgc_g8KWjg_A
---

ac704aa3440c340b7d67eadd90661ab038996fa6
diff --cc ChangeLog
index 4a41be28c,d769c8c74..bb349bd19
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,6 +1,8 @@@
+ * [Bug 1531] Require nonce with mrulist requests.
+ * [Bug 1532] Remove ntpd support for ntpdc's monlist in favor of ntpq's
+   mrulist.
 +(4.2.7p25) 2010/04/20 Released by Harlan Stenn <stenn@ntp.org>
 +* Include (4.2.6p2-RC2) [Bug 1528], Remove --with-arlib from br-flock.
  * Include (4.2.6p2-RC1) - [Bug 1503] [Bug 1504] [Bug 1518] [Bug 1522],
    all of which were fixed in 4.2.7 previously. 
  (4.2.7p24) 2010/04/13 Released by Harlan Stenn <stenn@ntp.org>