From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 10 May 2020 09:44:50 +0000 (+0000)
Subject: Merge cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d2a2e79d278749fa599e85f909b0e672e3f7385;p=thirdparty%2Fntp.git

Merge cleanup

bk: 5eb7cd12T-SqontTPf02EiDykbS-7A
---

diff --git a/ChangeLog b/ChangeLog
index 1008f370a..8435f36a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,8 @@
----
-* [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
-  - limit number of receive buffers, with an iron reserve for refclocks
-
 ---
 (4.2.8p15) 2020/04/xx Released by Harlan Stenn <stenn@ntp.or>
 
+* [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
+  - limit number of receive buffers, with an iron reserve for refclocks
 * [Bug 3664] Enable openSSL CMAC support on Windows <burnicki@ntp.org>
 * [Bug 3662] Fix build errors on Windows with VS2008 <burnicki@ntp.org>
 * [Bug 3659] Move definition of psl[] from ntp_config.h to