From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 14 Jan 2016 10:44:13 +0000 (+0000)
Subject: merge cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ce71c567d1dfb647bfac083fc75902a4d405975;p=thirdparty%2Fntp.git

merge cleanup

bk: 56977bfdkMqZN3tvC1UjFa1Al-QvTA
---

diff --git a/ChangeLog b/ChangeLog
index 64108981f..54074d664 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,7 +39,6 @@
 * [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 should only accept values [0..16]. perlinger@ntp.org
-  - 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 2944] errno is not preserved properly in ntpdate after sendto call.