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

merge cleanup

bk: 56976b84mmhqCxEGYSKlkyO55ruyAA
---

diff --git a/ChangeLog b/ChangeLog
index 78291296b..0a5f270b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
   list. perlinger@ntp.org
 * [Sec 2945] Zero Origin Timestamp Bypass. perlinger@ntp.org
 * [Sec 2948] Potential Infinite Loop in ntpq ( and ntpdc) perlinger@ntp.org
+* [Bug 2772] adj_systime overflows tv_usec. perlinger@ntp.org
 * Make leapsec_query debug messages less verbose.  Harlan Stenn.
 
 ---
@@ -31,7 +32,6 @@
 * CID 1341681: Nits in sntp/tests/keyFile.c.  HStenn.
 * CID 1341682: Nit in libntp/authreadkeys.c.  HStenn.
 * CID 1341684: Nit in tests/ntpd/t-ntp_signd.c.  HStenn.
-* [Bug 2772] adj_systime overflows tv_usec. perlinger@ntp.org
 * [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