From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 5 May 2010 02:45:48 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6940222865f2d62bfb24899cff01f75846e8c5a;p=thirdparty%2Fntp.git

Merge deacon.udel.edu:/deacon/backroom/ntp-dev
into  deacon.udel.edu:/deacon/backroom/snaps/ntp-dev

bk: 4be0dbdc_ha77979T1K48o-rAGZT3Q
---

d6940222865f2d62bfb24899cff01f75846e8c5a
diff --cc ChangeLog
index 80bc651a7c,727499475c..06b50ea7d9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,5 +1,9 @@@
+ (4.2.7p29) 2010/05/04 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1542] ntpd mrulist response may have incorrect last.older.
 +* [Bug 1543] ntpq mrulist must refresh nonce when retrying.
 +* [Bug 1544] ntpq mrulist sscanf timestamp format mismatch on 64-bit.
 +* Windows compiling hints/winnt.html update from Sunil Tej S.
+ (4.2.7p28) 2010/05/03 Released by Harlan Stenn <stenn@ntp.org>
  * Include (4.2.6p2-RC3) [Bug 1512] ntpsnmpd should connect to net-snmpd
    via a unix-domain socket by default.
    Provide a command-line 'socket name' option.