From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 20 Aug 2011 03:23:41 +0000 (-0400)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P206~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cd3fc7ebaa540bf90346faa5ad43010eb243a16;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 4e4f28bd1DUJ6LB9efyRDKhpVggSUA
---

7cd3fc7ebaa540bf90346faa5ad43010eb243a16
diff --cc ChangeLog
index fa090c5b6,9cc1967b7..16a2a4f10
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,7 +1,8 @@@
 +* [Bug 1993] ntpd Windows port adj_systime() broken in 4.2.7p203.
+ * sntp documentation and behavior improvements suggested by
+   Steven Sommars.
+ * Have sntp report synchronization distance instead of root dispersion.
+ * Clean up ntp-wait-opts.def .
  (4.2.7p205) 2011/08/19 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1992] util/tg2 doesn't compile, needs libntp.
  (4.2.7p204) 2011/08/16 Released by Harlan Stenn <stenn@ntp.org>