merge cleanup

bk: 565ec96chBtTF1e8MP8g94c90NcbsA

diff --git a/ChangeLog b/ChangeLog
index abfbb2176215f41e9994ff836dab3a8e2b7ef7c5..9fc1028470a9ebf7f18bc2f14077adfa24ece608 100644 (file)
--- 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.