From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 10 Nov 2008 00:04:59 +0000 (-0500)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P138~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b6b27c4358d78fcc75306e1887dd74c9407263b;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/murray/shm

bk: 49177aabapsuUavj7d47KWTkBrdhIw
---

3b6b27c4358d78fcc75306e1887dd74c9407263b
diff --cc ChangeLog
index 39f6643e0,c1969f010..1e4938165
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,8 +1,9 @@@
 +* SHM driver grabs more samples, add clockstats
+ (4.2.5p137) 2008/11/01 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1069] #undef netsnmp's PACKAGE_* macros.
+ * [Bug 1068] Older versions of netsnmp do not have netsnmp_daemonize().
+ (4.2.5p136) 2008/10/27 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1078] statsdir configuration parsing is broken.
  (4.2.5p135) 2008/09/23 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1072] clock_update should not allow updates older than sys_epoch.
  (4.2.5p134) 2008/09/17 Released by Harlan Stenn <stenn@ntp.org>