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

[Florian Forster]

 ChangeLog                   |    8 ++++++++
 configure.in                |    9 +++++++--
 contrib/PerlLib/Collectd.pm |    2 +-
 src/collectd-nagios.c       |   36 +++++++++++++++++++++++++-----------
 src/cpu.c                   |    2 +-
 src/interface.c             |    2 +-
 src/liboconfig/scanner.l    |    1 +
 src/load.c                  |    6 +++---
 src/memory.c                |    2 +-
 src/utils_dns.c             |    3 +++
 10 files changed, 51 insertions(+), 20 deletions(-)

New commits:
commit dd13e59199e95dfa5421ca33907c0cccc75e550c
Merge: 653d8334c5085f7559f3b12438c8636210e66701 7ef8c0d615dfd6162c2b4d7738ac476edb0fdb18
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jun 24 22:42:09 2007 +0200

    Merge branch 'collectd-4.0'

commit 7ef8c0d615dfd6162c2b4d7738ac476edb0fdb18
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jun 24 22:41:17 2007 +0200

    Bumped version to 4.0.4; Updated ChangeLog.

commit 3cf277cecb508f440bb460f20e218b76b21f45ab
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jun 24 22:40:36 2007 +0200

    src/collectd-nagios.c: Copy the NAN-defines from `collectd.h'.
    
    This should fix the bug reported by Daniel Leite.

commit e40574f34ddd759275de29bb67e25a8c6a433506
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Jun 23 09:02:13 2007 +0200

    dns plugin: Check for `net/ppp_defs.h' and include it before `net/if_ppp.h' if it exists.
    
    This hopefully solves build problems under OpenBSD.

commit 1e2be88ec45ed630796f5059348b393a55176973
Author: Daniel Leite <dleite at portoeditora.pt>
Date:   Thu Jun 21 10:45:18 2007 +0200

    memory plugin: Fix a typo in the Solaris code.

commit 486ca25992f54c6dba10075ed9edf1fe584a1c11
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Jun 21 10:40:49 2007 +0200

    liboconfig: Added `%option noyywrap' to the scanner.
    
    This should solve the link issues when collectd is built without flex being
    installed.

commit c58dfd821ae2bb5aba5524116a096971d032a5dd
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Jun 21 10:39:39 2007 +0200

    load plugin: Fix the Linux code that reads `/proc/loadavg'.

commit 1fdb04e6cb573ad06b914b9371f21ffb255b1d13
Author: Daniel Leite <dleite at portoeditora.pt>
Date:   Thu Jun 21 10:38:24 2007 +0200

    cpu, interface plugin: Fix compilation issues under Solaris.