From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 28 Feb 2015 11:36:06 +0000 (+0000)
Subject: Merge cleanup
X-Git-Tag: NTP_4_3_3~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d483d66621f0db6f7e79056e16f7b1024ad46e8;p=thirdparty%2Fntp.git

Merge cleanup

bk: 54f1a826GDDZuQa12NcQuaMQx3iz8A
---

diff --git a/ChangeLog b/ChangeLog
index dff384602..64a7e9744 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Below are from 4.2.8p2:
 * [Bug 2757] Quiet compiler warnings.
 * [Bug 2759] Expose nonvolatile/clk_wander_threshold to ntpq.
 * [Bug 2766] ntp-keygen output files should not be world-readable.
+* [Bug 2767] ntp-keygen -M should symlink to ntp.keys.
 (4.3.2) 2015/02/25 Released by Harlan Stenn <stenn@ntp.org>
 (4.3.1) 2015/02/21 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p2: