From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 14 Jan 2016 10:25:01 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2882
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=066f2f7dfc12a6d6e48aee2f48a007e6c1ca5424;p=thirdparty%2Fntp.git

Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2882
into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-p6+

bk: 5697777dWvlxqW4Rpl_6soObhWhn8A
---

066f2f7dfc12a6d6e48aee2f48a007e6c1ca5424
diff --cc ChangeLog
index a2b48dfa6,f77d769f6..a4543ce89
--- a/ChangeLog
+++ b/ChangeLog
@@@ -35,8 -18,9 +35,9 @@@
  * CID 1341682: Nit in libntp/authreadkeys.c.  HStenn.
  * CID 1341684: Nit in tests/ntpd/t-ntp_signd.c.  HStenn.
  * [Bug 2829] Look at pipe_fds in ntpd.c  (did so. perlinger@ntp.org)
+ * [Bug 2882] Look at ntp_request.c:list_peers_sum(). perlinger@ntp.org
  * [Bug 2887] stratum -1 config results as showing value 99
 -  - fudge stratum only accepts values [0..16]. perlinger@ntp.org
 +  - fudge stratum should only accept values [0..16]. perlinger@ntp.org
  * [Bug 2932] Update leapsecond file info in miscopt.html.  CWoodbury, HStenn.
  * [Bug 2934] tests/ntpd/t-ntp_scanner.c has a magic constant wired in.  HMurray
  * [Bug 2944] errno is not preserved properly in ntpdate after sendto call.