From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 13 Jul 2015 04:47:11 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_59~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11e434d61d9ddd974f1d3e1a6914701b254e6f60;p=thirdparty%2Fntp.git

merge cleanup

bk: 55a342cfFwkkUesaIucf0Hx1n5LzRw
---

diff --git a/ChangeLog b/ChangeLog
index ada140296..82471f53d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Below are from 4.2.8p4:
+* [Bug 2823] ntpsweep with recursive peers option doesn't work.  H.Stenn.
+* scripts/lib/NTP/Util.pm: stratum output is version-dependent.  Harlan Stenn.
 (4.3.58) 2015/07/12 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * [Bug 2875] sntp/Makefile.am: Get rid of DIST_SUBDIRS.  libevent must