From: Dave Hart <hart@ntp.org>
Date: Fri, 25 Nov 2011 10:25:49 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050
X-Git-Tag: NTP_4_2_6P5_RC2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bb42d3856ca94bd162c2eeeaadf14e9035c0322;p=thirdparty%2Fntp.git

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

bk: 4ecf6d2dVh8cqShWK4E_f4EXxWNBjg
---

2bb42d3856ca94bd162c2eeeaadf14e9035c0322
diff --cc ChangeLog
index b81fa6d8d,338873b29..c8434aae7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,12 +1,14 @@@
  ---
  
 +* [Bug 2050] Orphan mode stratum counting to infinity.
+ * [Bug 2059] optional billboard column "server" does not honor -n.
+ * [Bug 2066] ntpq lopeers ipv6 "local" column overrun.
+ * [Bug 2068] ntpd sends nonprintable stratum 16 refid to ntpq.
+ * [Bug 2069] broadcastclient, multicastclient spin up duplicate
+   ephemeral associations without broadcastdelay.
+ * Exclude not-yet-determined sys_refid from use in loopback TEST12
+   (from David Mills).  
 +
  ---
  (4.2.6p5-RC1) 2011/10/18 Released by Harlan Stenn <stenn@ntp.org>