From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 9 May 2015 03:34:07 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_32~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72772e480ed3c80c0817712d05d1b8d5b0838d37;p=thirdparty%2Fntp.git

merge cleanup

bk: 554d802fBSFtstfJH84sC9SeVdQRYA
---

diff --git a/ChangeLog b/ChangeLog
index 9617b2e1b..c5d32b334 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 Below are from 4.2.8p3:
+* [Bug 2792] If the IFF_RUNNING interface flag is supported then an
+  interface is ignored as long as this flag is not set since the
+  interface is not usable (e.g., no link).
 * [Bug 2808] GPSD_JSON driver enhancements, step 1.
   Increase internal token buffer to parse all JSON data, even SKY.
 (4.3.31) 2015/05/08 Released by Harlan Stenn <stenn@ntp.org>
@@ -182,9 +185,6 @@ From 4.2.8p2:
 ntp-4.3 begins.
 ---
 
-* [Bug 2792] If the IFF_RUNNING interface flag is supported then an
-  interface is ignored as long as this flag is not set since the
-  interface is not usable (e.g., no link).
 * CID 739725: Fix a rare resource leak in libevent/listener.c.
 * CID 1295478: Quiet a pedantic potential error from the fix for Bug 2776.
 * CID 1296235: Fix refclock_jjy.c and correcting type of the driver40-ja.html