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

[Florian Forster]

 src/collectd.conf.pod |   21 +++++-
 src/netapp.c          |    4 +-
 src/openvpn.c         |  205 +++++++++++++++++++++++++++++++++++++------------
 3 files changed, 176 insertions(+), 54 deletions(-)

New commits:
commit f4c25b4b234ba63fb9b15c2219d55d8af3e3f39d
Merge: 56e1979ea2d1a373c614cd71c902435f46090da1 9a071ebe0c457953011fe4bf213de7ff808970a3
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Mar 22 19:29:13 2010 +0100

    Merge branch 'fs/openvpn'
    
    Conflicts:
    	src/collectd.conf.pod
    	src/openvpn.c

commit 56e1979ea2d1a373c614cd71c902435f46090da1
Merge: 3b84d1b7d3603c6134ec3bf85c976d1f13192c03 4a73aa73423034fecb4c8d2e82e183427914ed74
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Mar 22 19:27:33 2010 +0100

    Merge branch 'collectd-4.9'

commit 4a73aa73423034fecb4c8d2e82e183427914ed74
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Mar 22 19:22:02 2010 +0100

    openvpn plugin: Fix a copy'n'paste error in the "new naming schema".

commit d55a2b0c4f0501b81af92a5caa0a6440b71690d2
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Mar 22 19:20:25 2010 +0100

    collectd.conf(5): Document the "ImprovedNamingSchema" option of the OpenVPN plugin.

commit 9a071ebe0c457953011fe4bf213de7ff808970a3
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Mar 22 19:26:30 2010 +0100

    collectd.conf(5): Document the "Collect{IndividualUsers,UserCount}" options of the OpenVPN plugin.

commit 7f7795d0c615ad4998c13651d5f1f01336f808f1
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Mar 22 19:08:04 2010 +0100

    openvpn plugin: Rename the "OnlyAggregateUsers" option to "CollectIndividualUsers".
    
    The semantic is inverted: When true (default) statistics for individual
    users will be collected.
    
    The "AggregateUsers" is now named "CollectUserCount" and a new name for
    "Compression", "CollectCompression", has been added. This makes the names
    of the config options consistent with one another.
    
    The module global configuration variables have been changed to _Bool
    while I was at it.

commit ecbb79db8d98763cc02dd7e6fab7e1b7d220dcb3
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Mar 22 18:42:29 2010 +0100

    openvpn plugin: Added copyright notice for Fabian Schuh.

commit 6e5172a247b190d9c17b8b69bb62262928a0c9ee
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Mar 22 18:42:09 2010 +0100

    src/openvpn.c: Re-indent the entire file.

commit 2380e87d9a7bd09638e4e397c1a5df8d816f5085
Author: Fabian Schuh <mail at xeroc.org>
Date:   Fri Mar 19 13:53:30 2010 +0100

    Bugfix that made collectd inflooping if no openvpn connection

commit f47fafadba730f0758e1718a103a970dd45dc5c5
Author: Fabian Schuh <mail at xeroc.org>
Date:   Fri Mar 19 10:07:50 2010 +0100

    Name changes - removed transfer statistics (doesn't make sense here)

commit 94a30ecc5a2e50301ddb2bdc3b1c4f52b168840e
Author: Fabian Schuh <mail at xeroc.org>
Date:   Thu Mar 18 14:41:34 2010 +0100

    Added Users Counter

commit 68958b2edc1e4dae3fa9112b98543dff0494381a
Author: Fabian Schuh <mail at xeroc.org>
Date:   Thu Mar 18 12:44:20 2010 +0100

    fixed typo

commit e483f6fd941e30e023a9772ea0d38c2fb8ad08e3
Author: Fabian Schuh <mail at xeroc.org>
Date:   Thu Mar 18 11:03:54 2010 +0100

    Bugfix with multiple files

commit 5d64da91085252c12fcfa4d28abc1ba50dc08bba
Author: Fabian Schuh <mail at xeroc.org>
Date:   Thu Mar 18 10:50:15 2010 +0100

    [openvpn] new feature 'SumOverAllUsers'

commit ddab3efe26e7a02438be35bb5045aab5c4094d1c
Author: Florian Forster <octo at noris.net>
Date:   Wed Mar 17 19:12:53 2010 +0100

    netapp plugin: Fix a syntax error in an error message.
    
    Thanks to facade from IRC for the hint.