From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 2 Dec 2015 10:35:24 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_85~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f544e96806433072e577cad184d4d1ef52f492c;p=thirdparty%2Fntp.git

merge cleanup

bk: 565ec96chBtTF1e8MP8g94c90NcbsA
---

diff --git a/ChangeLog b/ChangeLog
index abfbb2176..9fc102847 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Below are from 4.2.8p5:
 * [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
 (4.3.84) 2015/11/26 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p5:
 * Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.