From: Dave Hart <hart@ntp.org>
Date: Thu, 24 Dec 2009 07:42:08 +0000 (+0000)
Subject: Correct ChangeLog merge from stable
X-Git-Tag: NTP_4_2_7P4~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5589667b7105775b1b30551ea0d61277fe97c692;p=thirdparty%2Fntp.git

Correct ChangeLog merge from stable

bk: 4b331b50A3D4efkV1f-d0I4gfjpCqA
---

diff --git a/ChangeLog b/ChangeLog
index 30b1c8de4..264c47448 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* [Bug 1429] ntpd -4 option does not reliably force IPv4 resolution.
+* [Bug 1431] System headers must come before ntp headers in ntp_intres.c .
 (4.2.7p3) 2009/12/22 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1426] scripts/VersionName needs . on the search path.
 * [Bug 1427] quote missing in ./build - shows up on NetBSD.