From: Florian Forster Date: Sat, 4 Nov 2006 12:56:25 +0000 (+0100) Subject: Merge branch 'collectd-3.10' X-Git-Tag: collectd-3.11.0~61^2~1 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=dfe12aadb65933d7dd15d5e42d3c6218900bed15;hp=9c199c432be4160deb06233fd70420a4568ccf86;p=collectd.git Merge branch 'collectd-3.10' --- diff --git a/AUTHORS b/AUTHORS index 9a35d036..cde1d11a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -41,6 +41,10 @@ contributed: The `log' mode has been written by: Christophe Kalt +Much time and effort to find a nasty bug in the ntpd-plugin has been +contributed by: + Lubos Stanek + collectd is available at: diff --git a/ChangeLog b/ChangeLog index e3cec858..88d150ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-11-04, Version 3.10.3 + * Lubos Stanek has identified a bug in the ntpd-plugin: When the + ntpd's reply was sent in more than one packet, the buffer size was + calculated incorrectly, resulting in the reading of uninitialized or + freed memory. + 2006-11-01, Version 3.10.2 * The sample config file has been improved. * Errors in the manpages have been corrected. diff --git a/configure.in b/configure.in index 4c75f8c3..6d3698eb 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(collectd, 3.10.2) +AC_INIT(collectd, 3.10.3) AC_CONFIG_SRCDIR(src/collectd.c) AC_CONFIG_HEADERS(src/config.h) AM_INIT_AUTOMAKE(dist-bzip2) diff --git a/debian/changelog b/debian/changelog index 168ec407..3bd5e05b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -collectd (3.10.2-0octo1) unstable; urgency=low +collectd (3.10.3-0octo1) unstable; urgency=low * New upstream release. - -- Florian Forster Wed, 1 Nov 2006 16:16:49 +0100 + -- Florian Forster Sat, 4 Nov 2006 13:46:49 +0100 collectd (3.10.1-4) unstable; urgency=low