From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 11 Jun 2015 20:44:32 +0000 (+0000)
Subject: Merge cleanup
X-Git-Tag: NTP_4_3_39~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f1f8a2ecbf0412a234c50a7ff381e1fc243cc03;p=thirdparty%2Fntp.git

Merge cleanup

bk: 5579f330XD21X1jfwtimSVIeyVHmCg
---

diff --git a/ChangeLog b/ChangeLog
index 4b1ab75a4..8ad907f38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Below are from 4.2.8p3:
+* [Bug 2843] make check fails on 4.3.36
+   Fixed compiler warnings about numeric range overflow
+   (The original topic was fixed in a byplay to bug#2830)
 (4.3.38) 2015/06/11 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * [Bug 2778] Implement "apeers"  ntpq command to include associd.