Merge cleanup

bk: 54f1af2dJpNIUU0JozGE8EhTYwIt6w

diff --git a/ChangeLog b/ChangeLog
index a89fc64754ffefed7d26b498172abd2b65bf827a..5d165dce92ec1027504eed76293cce0896596e40 100644 (file)
--- 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: