From: Dave Hart <hart@ntp.org>
Date: Sun, 27 Nov 2011 00:41:17 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050
X-Git-Tag: NTP_4_2_6P5_RC2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6c7041dd9495dc71c5dbcd1e9b967c2dcf3ea75;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: 4ed1872dI0z02szgngNoWx0rmTKEEQ
---

c6c7041dd9495dc71c5dbcd1e9b967c2dcf3ea75
diff --cc ChangeLog
index c8434aae7,ce47bd3d4..6223f4eb1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,7 +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.
+ * [Bug 2072] Orphan parent selection metric needs ntohl().
 +* 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>