From: Dave Hart <hart@ntp.org>
Date: Tue, 29 Nov 2011 13:34:00 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2059-66-68-69
X-Git-Tag: NTP_4_2_6P5_RC2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ef91910a695822be0ebce0e41b9d1383379cc39;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2059-66-68-69
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050-59-66-68-69

bk: 4ed4df48PN45Yox4s7grocG-1WCyPQ
---

0ef91910a695822be0ebce0e41b9d1383379cc39
diff --cc ChangeLog
index 6223f4eb1,442c31487..a5ec25b81
--- a/ChangeLog
+++ b/ChangeLog
@@@ -6,10 -5,10 +6,12 @@@
  * [Bug 2068] ntpd sends nonprintable stratum 16 refid to ntpq.
  * [Bug 2069] broadcastclient, multicastclient spin up duplicate
    ephemeral associations without broadcastdelay.
 +* [Bug 2072] Orphan parent selection metric needs ntohl().
  * Exclude not-yet-determined sys_refid from use in loopback TEST12
-   (from David Mills).  
+   (from David Mills).
+ * Never send KoD rate limiting response to MODE_SERVER response.
+ 
 +
  ---
  (4.2.6p5-RC1) 2011/10/18 Released by Harlan Stenn <stenn@ntp.org>