From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 29 Sep 2015 11:00:16 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_73~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71573b6d01b8faa4ded5fa240eb4d58d58925fcf;p=thirdparty%2Fntp.git

merge cleanup

bk: 560a6f40Rs9MkKcPXeCR786MgW3VIQ
---

diff --git a/ChangeLog b/ChangeLog
index 6e5cb219b..fdf0922e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ Below are from 4.2.8p4:
 * More updates for bug 2817.  Harlan Stenn.
 * Fix bugs in tests/ntpd/ntp_prio_q.c.  Harlan Stenn.
 * gcc on older HPUX may need +allowdups.  Harlan Stenn.
+* Disable certain test programs on certain platforms.  Harlan Stenn.
 (4.3.72) 2015/09/21 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * Unit test dist cleanup. Harlan Stenn.