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

Merge cleanup

bk: 54f1af2dJpNIUU0JozGE8EhTYwIt6w
---

diff --git a/ChangeLog b/ChangeLog
index a89fc6475..5d165dce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Below are from 4.2.8p2:
 * [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.
+* [Bug 2771] nonvolatile value is documented in wrong units.
 (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: