From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 6 May 2015 00:06:51 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_3_41~2^2~2^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29ba795cb79c0ed7a556c923625f0ebc270fc587;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-stable
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2805

bk: 55495b1b4ou3BVwlvAR31wMMvKLHKA
---

29ba795cb79c0ed7a556c923625f0ebc270fc587
diff --cc ChangeLog
index 3e8634fdc,bab8c4566..21a86196d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -13,7 -7,7 +13,8 @@@
  * [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.
    Various improvements, see http://bugs.ntp.org/2808 for details.
    Changed libjsmn to a more recent version.