From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 2 Dec 2015 10:16:34 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2887/
X-Git-Tag: NTP_4_3_85~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bc702989ceb5c50dfe79c9559dcf3aefdc9416b;p=thirdparty%2Fntp.git

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

bk: 565ec502-5CVzGIlmuLX-4WDya7Y6g
---

8bc702989ceb5c50dfe79c9559dcf3aefdc9416b
diff --cc ChangeLog
index c58e2a0b8,f88ea5eca..9024c0f26
--- a/ChangeLog
+++ b/ChangeLog
@@@ -3,8 -3,7 +3,9 @@@
  * [Sec 2956] small-step/big-step.  Close the panic gate earlier.  HStenn.
  * CID 1339955: Free allocated memory in caljulian test.  HStenn.
  * CID 1339962: Explicitly initialize variable in caljulian test.  HStenn.
+ * [Bug 2829] Look at pipe_fds in ntpd.c  (did so. perlinger@ntp.org)
 +* [Bug 2887] stratum -1 config results as showing value 99
 +  - fudge stratum only accepts 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 2954] Version 4.2.8p4 crashes on startup with sig fault