From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 24 Apr 2015 09:01:56 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_3_18~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=546a66fe3d6b98523974d559e84a68953a9a35f7;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-2776

bk: 553a0684rqxLDVKLEM4JqBHWSv4k1A
---

546a66fe3d6b98523974d559e84a68953a9a35f7
diff --cc ChangeLog
index e965c762d,39d5c23af..812752aab
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,9 @@@
  ---
  
 +* [Bug 2776] Improve ntpq's 'help keytype'.
  * [Bug 2794] Clean up kernel clock status reports.
+ * [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 2808] GPSD_JSON driver enhancements, step 1.
    Various improvements, see http://bugs.ntp.org/2808 for details.