merge cleanup

bk: 560a6f40Rs9MkKcPXeCR786MgW3VIQ

diff --git a/ChangeLog b/ChangeLog
index 6e5cb219b1c652c7841d5360feaedca339a2c1db..fdf0922e4e3bdc9e27babaccf42951e2b1b2f615 100644 (file)
--- 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.