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

Wed Apr 21 19:05:18 CEST 2010

 ChangeLog              |   31 +++++++++++++++++++++++++++++++
 contrib/exec-nagios.px |   10 ++++++----
 src/network.c          |    4 ++--
 src/plugin.c           |   14 ++++++--------
 version-gen.sh         |    2 +-
 5 files changed, 46 insertions(+), 15 deletions(-)

New commits:
commit a158940fd85bbef59a65f593cd8130896f5c44d0
Merge: cfc1e53a271638237fb0da769ae0e5485fa99495 d48a9456e42af4ab5881ab055c95ceab71819bc1
Author: Florian Forster <octo at noris.net>
Date:   Wed Apr 21 19:05:15 2010 +0200

    Merge branch 'collectd-4.9'

commit d48a9456e42af4ab5881ab055c95ceab71819bc1
Merge: 07be522384e753b7921213a0dc96a50336c79a66 a841b5f2882acf431f4fd0783f602f3ae80716c5
Author: Florian Forster <octo at noris.net>
Date:   Wed Apr 21 19:04:01 2010 +0200

    Merge branch 'collectd-4.8' into collectd-4.9
    
    Conflicts:
    	ChangeLog

commit a841b5f2882acf431f4fd0783f602f3ae80716c5
Author: Florian Forster <octo at noris.net>
Date:   Wed Apr 21 16:23:46 2010 +0200

    src/plugin.c: plugin_log: Append newline to message â€¦
    
    â€¦ even when no log-plugin was loaded.

commit 99ea6c890424d5045cd33db8daa7c28d887b2a88
Author: Florian Forster <octo at noris.net>
Date:   Wed Apr 21 16:19:53 2010 +0200

    network plugin: Don't access values in an already freed array.

commit 3d4623c1bc42e948b0e2de709afddba323c17a5f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Apr 19 13:05:15 2010 +0200

    contrib/exec-nagios.px: Whitespace and POD fixes.

commit 852857dc37956167a7005212195b5f8bab133f33
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Wed Apr 7 12:55:03 2010 +0200

    Bumped version to 4.8.2; Updated ChangeLog.