From: Harlan Stenn Date: Thu, 4 Aug 2011 20:25:19 +0000 (-0400) Subject: Merge bk://bk.ntp.org/ntp-dev X-Git-Tag: NTP_4_2_7P201~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=344a2ebe2cd3fb9c8da1d9a36f3e5665e5dcaa70;p=thirdparty%2Fntp.git Merge bk://bk.ntp.org/ntp-dev into psp-deb1.ntp.org:/home/stenn/ntp-dev bk: 4e3b002fEzJJo5kHDxNjDwT_OiZdLQ --- 344a2ebe2cd3fb9c8da1d9a36f3e5665e5dcaa70 diff --cc ChangeLog index e23576a53,147909bec..eccff1e6c --- a/ChangeLog +++ b/ChangeLog @@@ -1,5 -1,5 +1,10 @@@ + * sntp: change -h/--headspace to -g/--gap, and change the default gap + from 10 to 50ms ++* [Backward Incompatible] from 4.2.6p4: sntp: -l/--filelog -> ++ -l/--logfile, to be consistent with ntpd. ++* From 4.2.6p4: libopts/file.c fix from Bruce Korb (arg-type=file). +(4.2.7p200) 2011/08/04 Released by Harlan Stenn +* Sync with 4.2.6p4-RC2. (4.2.7p199) 2011/07/29 Released by Harlan Stenn * Documentation updates from Dave Mills. (4.2.7p198) 2011/07/28 Released by Harlan Stenn @@@ -1067,6 -1067,6 +1072,12 @@@ * [Bug 1414] Enable "make distcheck" success with BSD make. (4.2.7) 2009/12/09 Released by Harlan Stenn * [Bug 1407] configure.ac: recent GNU Make -v does not include "version". ++--- ++ ++* [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be ++ consistent with ntpd. ++* libopts/file.c fix from Bruce Korb (arg-type=file). ++ --- (4.2.6p4-RC2) 2011/08/04 Released by Harlan Stenn