From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 16 Mar 2016 09:32:24 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7b2280bfd32962cc926f6913223788632018006;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7

bk: 56e92828La0x5rU6omdALXUqwVcsWg
---

b7b2280bfd32962cc926f6913223788632018006
diff --cc ChangeLog
index 19f3836f8,628833383..6895cdfab
--- a/ChangeLog
+++ b/ChangeLog
@@@ -30,11 -13,11 +30,13 @@@
    - refactored handling of key access lists (auth[read]keys.c)
    - reduced number of error branches (authreadkeys.c)
  * [Bug 3023] ntpdate cannot correct dates in the future. perlinger@ntp.org
+ * [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
  * Document ntp.key's optional IP list in authenetic.html.  Harlan Stenn.
 +* Update html/xleave.html documentation.  Harlan Stenn.
 +* Update ntp.conf documentation.  Harlan Stenn.
  * Fix some Credit: attributions in the NEWS file.  Harlan Stenn.
  * Fix typo in html/monopt.html.  Harlan Stenn.
+ * Add README.pullrequests.  Harlan Stenn.
  
  ---
  (4.2.8p6) 2016/01/20 Released by Harlan Stenn <stenn@ntp.org>