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

Merge cleanup

bk: 54f1a526T47sofPpetCSRqgvzwSNug
---

diff --git a/ChangeLog b/ChangeLog
index 1d3f6bebb..511f52e7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Below are from 4.2.8p2:
 * [Bug 2756] ntpd hangs in startup with gcc 3.3.5 on ARM.
 * [Bug 2757] Quiet compiler warnings.
+* [Bug 2759] Expose nonvolatile/clk_wander_threshold to ntpq.
 (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: