merge cleanup

bk: 56976f40Vqpa-LjCuVCeqFsAvGG3uQ

diff --git a/ChangeLog b/ChangeLog
index 1f59dc19a86ac8614456e50284a82d3995dfd827..a2b48dfa61b954214632d935e40c9167c9350c2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
 * [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
+* [Bug 2814] msyslog deadlock when signaled. perlinger@ntp.org
+  - applied patch by shenpeng11@huawei.com with minor adjustments
 * Make leapsec_query debug messages less verbose.  Harlan Stenn.
 
 ---
@@ -32,8 +34,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 2814] msyslog deadlock when signaled. perlinger@ntp.org
-  - applied patch by shenpeng11@huawei.com with minor adjustments
 * [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