[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 ChangeLog        |    6 ++++++
 debian/changelog |    6 ++++++
 src/ntpd.c       |   33 +++++++++++++++++++++++++++++----
 3 files changed, 41 insertions(+), 4 deletions(-)

New commits:
commit 2cce6f0069de350ff968c414a9ff30ad5ef451f2
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed May 30 08:08:04 2007 +0200

    ntpd plugin: Replace `syslog (LOG_ERR, ...)' with `ERROR (...)'.

commit 721f8d81910c71154aba9ff8d243db52bfb584ed
Merge: 011b30ce3a419d543040102bb3d077e7fbd4aa0f c75ed18827199e3d139c671256a9c61f0d8d4d8d
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed May 30 08:06:48 2007 +0200

    Merge branch 'collectd-3.11'
    
    Conflicts:
    
    	ChangeLog
    	configure.in

commit c75ed18827199e3d139c671256a9c61f0d8d4d8d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue May 29 22:51:49 2007 +0200

    Bumped version to 3.11.5; Updated ChangeLog.

commit 0f110d90eecf3a7b26f45434f4091709b67fc4d0
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue May 29 21:40:07 2007 +0200

    ntpd plugin: Fix a possible buffer overflow.