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

[Florian Forster]

 ChangeLog                      |   57 ++++++++++++++++++++++++++++++++++++++++
 contrib/redhat/init.d-collectd |    7 +++--
 src/collectd.conf.pod          |    4 +++
 src/netapp.c                   |    3 ++
 src/processes.c                |   13 ++++++---
 src/swap.c                     |    2 +-
 src/utils_rrdcreate.c          |   12 ++++----
 version-gen.sh                 |    2 +-
 8 files changed, 85 insertions(+), 15 deletions(-)

New commits:
commit 853b3da5d4c6614d7db4093f57b1ca4f57b6c485
Merge: 5c4d218936559af2f6cb9857af7f5b9c8d83be6d b6c3774b0d4690d666a12cfeeff28a158484a36b
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Nov 27 11:46:11 2010 +0100

    Merge branch 'collectd-4.10'
    
    Conflicts:
    	src/utils_rrdcreate.c

commit b6c3774b0d4690d666a12cfeeff28a158484a36b
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Nov 27 11:03:34 2010 +0100

    Bump version to 4.10.2; Update ChangeLog.

commit 66f9d645f883eee0aa408428eefdebdcc6dcfa7e
Merge: 69395dbecda0e01df70b69a61f72d12a897037d9 3b4201d2235c25ed21174c41c526c9b7894de539
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Nov 27 11:00:29 2010 +0100

    Merge branch 'collectd-4.9' into collectd-4.10
    
    Conflicts:
    	ChangeLog
    	src/collectd.conf.pod
    	version-gen.sh

commit 3b4201d2235c25ed21174c41c526c9b7894de539
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Nov 27 10:55:47 2010 +0100

    Bump version to 4.9.4; Update ChangeLog.

commit 613f5b8a4a3ec711b29928ba78ab7d318ff169fc
Merge: 0a6626747f40f7a39947033e8e64242e731cd7e1 ab9fd6d9336a623b7feb73e284cbd072496de102
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Nov 25 11:51:17 2010 +0100

    Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9

commit ab9fd6d9336a623b7feb73e284cbd072496de102
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Thu Nov 25 10:56:30 2010 +0100

    netapp: Fixed incompatible changes between NetApp Release 7.2 and 7.3 that prevented collecting SIS data

commit 69395dbecda0e01df70b69a61f72d12a897037d9
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Nov 23 18:45:49 2010 +0100

    swap plugin: Fix a bug collecting swap I/O.

commit 0a6626747f40f7a39947033e8e64242e731cd7e1
Merge: 7b32bdd018cd6be37bfd1759fbba8c4623ec6f1e 7a36ec8f2c85621240e479c76c910083196f0e2c
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Nov 16 12:20:18 2010 +0100

    Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9

commit 7a36ec8f2c85621240e479c76c910083196f0e2c
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Tue Nov 16 12:11:45 2010 +0100

    Fixed RedHat init script to shut down collectd on reboot/halt.

commit 7b32bdd018cd6be37bfd1759fbba8c4623ec6f1e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Sun Nov 14 10:52:13 2010 +0100

    collectd.conf(5): Document the dangers of messing with the interval setting.

commit c089c920528313b72a535dabfcdbd91a66c8d977
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Fri Nov 12 08:13:42 2010 +0100

    processes plugin: Don't complain about a failed open(/proc/$PID/cmdline)
    
    ... if the error is ENOENT. This merely means we were too slow and that
    we can safely ignore the process.

commit 11893a7c85389e6d8a07d1ee8473294767c7ccb9
Author: Florian Forster <octo at noris.net>
Date:   Thu Nov 11 14:20:58 2010 +0100

    src/utils_rrdcreate.c: Remove a too strict assertion.
    
    We don't actually check anywhere that vl->time is greater than 10, so we
    cannot assure this.