From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 14 Jun 2015 03:18:13 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_41~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1b117f813df71b9b6e2fabb12e822ab7219bde5;p=thirdparty%2Fntp.git

merge cleanup

bk: 557cf275mFpkU42-AvKG4L4GXIqjeg
---

diff --git a/ChangeLog b/ChangeLog
index d047191a3..e96088e1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ---
 
 * [Bug 2778] Implement "apeers"  ntpq command to include associd.
+* [Bug 2805] ntpd fails to join multicast group.
 * [Bug 2824] Convert update-leap to perl. (also see 2769)
 * [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey
    NTPD transfers the current TAI (instead of an announcement) now.
@@ -55,7 +56,6 @@
 * [Bug 2800] refclock_true.c true_debug() can't open debug log because
   of incompatible open/fdopen parameters.
 * [Bug 2804] install-local-data assumes GNU 'find' semantics.
-* [Bug 2805] ntpd fails to join multicast group.
 * [Bug 2806] refclock_jjy.c supports the Telephone JJY.
 * [Bug 2808] GPSD_JSON driver enhancements, step 1.
   Fix crash during cleanup if GPS device not present and char device.