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

[Florian Forster]

 ChangeLog        |   17 +++++++++++++++++
 src/collectd.h   |   17 +++++++++++++----
 src/configfile.c |    2 +-
 src/ntpd.c       |   20 ++++++++++----------
 src/perl.c       |    6 ++++++
 src/snmp.c       |    8 ++++----
 src/vserver.c    |   48 +++++++++++++++++++++++++++++++++++++++++++-----
 version-gen.sh   |    2 +-
 8 files changed, 95 insertions(+), 25 deletions(-)

New commits:
commit 92445ff3363441d0f515de4a3ab92a504cfc0366
Merge: 765c149c2f753252f67a5575c1bddd3d3ee2b38f a6124ab6c4ffcbbd1f57995b14e8d057f2c86f36
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Jul 15 17:12:21 2008 +0200

    Merge branch 'collectd-4.4'
    
    Conflicts:
    
    	src/snmp.c

commit a6124ab6c4ffcbbd1f57995b14e8d057f2c86f36
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Jul 15 16:39:29 2008 +0200

    ChangeLog: Updated after the merge.

commit d767db104769bed7fefea61538bdacb364434e9a
Merge: 4bc5568e749defb044160bb0cd80c5cb5fa3267c 438b4bd83e84a2946dce77c61c160a4bbab02e36
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Jul 15 16:32:37 2008 +0200

    Merge branch 'collectd-4.3' into collectd-4.4

commit 4bc5568e749defb044160bb0cd80c5cb5fa3267c
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jul 15 16:29:39 2008 +0200

    Bumped version to 4.4.2; Updated ChangeLog.

commit 438b4bd83e84a2946dce77c61c160a4bbab02e36
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sat Jul 12 11:36:04 2008 +0200

    configfile.c: Fixed a typo.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit fa654155e6286512a61265ea8cb90ec3d35b26c6
Author: Peter Holik <peter at holik.at>
Date:   Tue Jul 15 08:21:21 2008 +0200

    ipmi plugin: Fix a typo: sstrerror_r -> sstrerror.

commit 0fb6fc95c1046e3febf6482d9be8895dc6fd29d0
Author: Florian Forster <octo at noris.net>
Date:   Mon Jul 14 19:38:11 2008 +0200

    snmp plugin: More format string fixes.

commit 33cef6a0c5bdd5c6d453f77e53eeadf1968cad93
Author: Florian Forster <octo at noris.net>
Date:   Mon Jul 14 17:35:42 2008 +0200

    ntpd plugin: Use the standard types `uint8_t' etc. instead of `u_char' etc.

commit e5182de306d64ba778c39a34f5c34961bd8c01b3
Author: Florian Forster <octo at noris.net>
Date:   Mon Jul 14 17:27:36 2008 +0200

    vserver plugin: Use `readdir_r' instead of `readdir'.
    
    `readdir' is not thread safe, so use the (more thread safe) `readdir_r'.
    Also, don't use the non-standard `d_type' member of the `dirent'
    structure - it's not portable.
    
    I'm aware that this plugin is very Linux specific and Linux most likely
    will never use another C library than the GNU libc, but using this
    member prevents me from compiling with the most restrictive `strict'
    settings..

commit e3a720229e831073dc22fb1bc5a63530647bcf9c
Author: Florian Forster <octo at noris.net>
Date:   Mon Jul 14 15:47:02 2008 +0200

    src/{collectd.h,perl.c}: Poison sprintf after perl.h has been included.

commit b6accbb246890a0cc74a2bdf5d41b7c1b89bbc94
Author: Florian Forster <octo at noris.net>
Date:   Mon Jul 14 11:57:41 2008 +0200

    snmp plugin: Fix two format strings.

commit 1b0b124913a10f0ab9cb8d3d6bde80d90225f1c8
Author: Florian Forster <octo at noris.net>
Date:   Mon Jul 14 10:04:37 2008 +0200

    src/collectd.h: Don't include <pth.h>.
    
    We don't use it, we don't check for it. Why on earth is it still in there..?