]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk2.ntp.org./ntp-dev
authorDave Hart <hart@ntp.org>
Sat, 20 Nov 2010 03:33:54 +0000 (03:33 +0000)
committerDave Hart <hart@ntp.org>
Sat, 20 Nov 2010 03:33:54 +0000 (03:33 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1725

bk: 4ce741a2_iWqHqDiePqnFXFGUYApCQ

1  2 
ChangeLog
include/ntp.h
include/ntpd.h
ntpd/ntp_config.c
ntpd/ntp_request.c

diff --cc ChangeLog
index 9f7f57d35aa7805651db218f80b95b58cbc01f24,81cec8ab64b2ebc1aed67b84d711e6df0a4024f4..65e50435d2d0348cb243ce41fa0275c84778fd2d
+++ b/ChangeLog
@@@ -1,9 -1,10 +1,14 @@@
 +* [Bug 1725] from 4.2.6p3-RC11: ntpd sends multicast from only one
 +  address.
+ * An almost complete rebuild of the initial loopfilter configuration
+   process, including the code that determines the interval between
+   frequency file updates, from Dave Mills.
+ * Documentation updates from Dave Mills.
+ (4.2.7p83) 2010/11/17 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1727] ntp-keygen PLEN, ILEN undeclared --without-crypto.
  * Remove top-level libopts, use sntp/libopts.
 +* from 4.2.6p3-RC11: Remove log_msg() and debug_msg() from sntp in favor
 +  of msyslog().
  * Documentation updates from Dave Mills.
  (4.2.7p82) 2010/11/16 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1728] from 4.2.6p3-RC11: In ntp_openssl.m4, don't add
diff --cc include/ntp.h
Simple merge
diff --cc include/ntpd.h
Simple merge
Simple merge
Simple merge