From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 3 Apr 2015 02:31:18 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_2_8P2_RC2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5021a06a776c93f41a0ebd1efad1e0aaaecd824e;p=thirdparty%2Fntp.git

merge cleanup

bk: 551dfb76jyfufzQs3sSpRvntoZGd5g
---

diff --git a/ChangeLog b/ChangeLog
index b319d2884..0c44c9f63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 ---
 
-* [Bug 2788] New flag -G (force_step_once).
 * [Bug 2592] FLAG_TSTAMP_PPS cleanup for refclock_parse.c.
+* [Bug 2769] New script: update-leap
+* [Bug 2769] cleannup for update-leap
+* [Bug 2788] New flag -G (force_step_once).
 * [Bug 2794] Clean up kernel clock status reports.
 * [Bug 2795] Cannot build without OpenSLL (on Win32).
   Provided a Win32 specific wrapper around libevent/arc4random.c.
@@ -33,8 +35,6 @@
 * [Bug 2763] Allow different thresholds for forward and backward steps.
 * [Bug 2766] ntp-keygen output files should not be world-readable.
 * [Bug 2767] ntp-keygen -M should symlink to ntp.keys.
-* [Bug 2769] New script: update-leap
-* [Bug 2769] cleannup for update-leap
 * [Bug 2771] nonvolatile value is documented in wrong units.
 * [Bug 2773] Early leap announcement from Palisade/Thunderbolt
 * [Bug 2774] Unreasonably verbose printout - leap pending/warning