From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 21 Feb 2011 08:59:49 +0000 (-0500)
Subject: The fixes for bugs 1087 and 1088 are in the udated SNTP code
X-Git-Tag: NTP_4_2_7P131~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb27f459fb2db1977ebfa342e406e487e4851c70;p=thirdparty%2Fntp.git

The fixes for bugs 1087 and 1088 are in the udated SNTP code

bk: 4d6229857haTmAkhgM7CKQ_HVWK8iw
---

diff --git a/ChangeLog b/ChangeLog
index f71cabf3c..a2f9f7421 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* [Bug 1087] -v/--normalverbose conflicts with -v/--version in sntp.
+* [Bug 1088] sntp should (only) report the time difference without -s/-a.
 * older autoconf sometimes dislikes [].
 * Move "can't write KoD file" warning from sntp shutdown to startup.
 * refclock_acts.c cleanup from Dave Mills.