Code

collectd.git
9 years agoInitial import
Marc Falzon [Wed, 19 Nov 2014 16:41:30 +0000 (17:41 +0100)]
Initial import

9 years agoInitial commit
Marc Falzon [Wed, 19 Nov 2014 16:29:33 +0000 (17:29 +0100)]
Initial commit

9 years agoserial plugin: Fix -Wshorten-64-to-32 warning.
Florian Forster [Fri, 3 Jul 2015 13:15:09 +0000 (15:15 +0200)]
serial plugin: Fix -Wshorten-64-to-32 warning.

serial.c:87:28: error: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Werror,-Wshorten-64-to-32]
                len = strlen (fields[0]) - 1;
                    ~ ~~~~~~~~~~~~~~~~~~~^~~
serial.c:96:10: error: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Werror,-Wshorten-64-to-32]
                        len = strlen (fields[i]);
                            ~ ^~~~~~~~~~~~~~~~~~

9 years agosrc/utils_ignorelist.c: Reimplement ignorelist_append_regex().
Florian Forster [Fri, 3 Jul 2015 13:06:28 +0000 (15:06 +0200)]
src/utils_ignorelist.c: Reimplement ignorelist_append_regex().

There's a signed / unsigned conversion in that function ...
... aaaaand it's fully rewritten. Oops.

9 years agocollectd-tg: Remove use of NAN.
Florian Forster [Fri, 3 Jul 2015 11:55:24 +0000 (13:55 +0200)]
collectd-tg: Remove use of NAN.

This broke the build under Solaris, once again *sigh*.

collectd-tg.c: In function ‘dtime’:
collectd-tg.c:108:12: error: ‘NAN’ undeclared (first use in this function)
     return NAN;
            ^

9 years agoTake out explicit definitions as they are already checked via enable_standards in...
Dagobert Michelsen [Thu, 18 Jun 2015 13:28:36 +0000 (15:28 +0200)]
Take out explicit definitions as they are already checked via enable_standards in configure.ac.

Fixes: #978
9 years agocollectd-tg: Move _POSIX_C_SOURCE and friends to the Makefile.
Florian Forster [Fri, 3 Jul 2015 10:31:32 +0000 (12:31 +0200)]
collectd-tg: Move _POSIX_C_SOURCE and friends to the Makefile.

Apparently defining this in the source files confuses Solaris' libc.
Thanks to @dago for looking into this.

Hopefully fixes: #978

9 years agocollectdctl: Fix -Wsign-conversion warnings.
Florian Forster [Fri, 3 Jul 2015 09:52:50 +0000 (11:52 +0200)]
collectdctl: Fix -Wsign-conversion warnings.

Also fixes a shadowed local variable warning.

9 years agocollectd-nagios: Fix -Wsign-conversion warnings.
Florian Forster [Fri, 3 Jul 2015 09:49:07 +0000 (11:49 +0200)]
collectd-nagios: Fix -Wsign-conversion warnings.

9 years agocollectd-tg: Fix unintentional cast from double to time_t.
Florian Forster [Fri, 3 Jul 2015 09:44:28 +0000 (11:44 +0200)]
collectd-tg: Fix unintentional cast from double to time_t.

This fix is likely incomplete: the printf() line is probably executed way
too often now.

9 years agoutils_cache.c, scale target: Don't re-implement counter wrap-around logic.
Florian Forster [Fri, 3 Jul 2015 06:23:29 +0000 (08:23 +0200)]
utils_cache.c, scale target: Don't re-implement counter wrap-around logic.

9 years agosrc/daemon/utils_subst_test.c: Actually add unit test.
Florian Forster [Mon, 29 Jun 2015 15:56:37 +0000 (17:56 +0200)]
src/daemon/utils_subst_test.c: Actually add unit test.

D'oh!

9 years agosrc/daemon/utils_subst.c: Sanitize buffer offsets better.
Florian Forster [Mon, 29 Jun 2015 15:32:44 +0000 (17:32 +0200)]
src/daemon/utils_subst.c: Sanitize buffer offsets better.

The previous implementation broke when off1 / off2 were outside of "string"
but within "buflen". It also had problems if the replacement string was
too long. This new implementation truncates the buffer as expected and
is properly tested.

9 years agowrite_riemann plugin: Ensure that "statuses" is always initialized.
Florian Forster [Mon, 29 Jun 2015 10:52:03 +0000 (12:52 +0200)]
write_riemann plugin: Ensure that "statuses" is always initialized.

Hopefully fixes "Uninitialized argument value" warning.

9 years agosrc/daemon/common.[ch]: Improve signature of value_to_rate().
Florian Forster [Mon, 29 Jun 2015 10:50:51 +0000 (12:50 +0200)]
src/daemon/common.[ch]: Improve signature of value_to_rate().

Passing in "value" as a derive_t and returning the rate as a value_t is
just inconvenient and wrong. Instead, pass "value" as a value_t and return
the rate in a gauge_t. While at it, move the state pointer to the end of
the argument list.

9 years agosrc/daemon/common_test.c: Fix "decimal constant is unsigned only in ISO C90" warning.
Florian Forster [Mon, 29 Jun 2015 07:51:12 +0000 (09:51 +0200)]
src/daemon/common_test.c: Fix "decimal constant is unsigned only in ISO C90" warning.

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Sun, 28 Jun 2015 13:05:45 +0000 (15:05 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Sun, 28 Jun 2015 13:05:36 +0000 (15:05 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agosrc/daemon/common.c: Fix handling of counter_t in value_to_rate().
Florian Forster [Sun, 28 Jun 2015 13:00:49 +0000 (15:00 +0200)]
src/daemon/common.c: Fix handling of counter_t in value_to_rate().

Also fixes an off-by-one error in counter_diff() and adds a unit test for
the function.

9 years agosrc/daemon/common.c: Fix off-by-one error in escape_slashes().
Florian Forster [Sun, 28 Jun 2015 12:05:05 +0000 (14:05 +0200)]
src/daemon/common.c: Fix off-by-one error in escape_slashes().

Partial cherry-pick of 0cba91923be9326224f8434e4aae7691f7b6dad1.

9 years agosrc/daemon/common.c: Add unit test for escape_string().
Florian Forster [Sun, 28 Jun 2015 12:08:02 +0000 (14:08 +0200)]
src/daemon/common.c: Add unit test for escape_string().

9 years agosrc/daemon/common.c: Fix off-by-one error in escape_slashes().
Florian Forster [Sun, 28 Jun 2015 12:05:05 +0000 (14:05 +0200)]
src/daemon/common.c: Fix off-by-one error in escape_slashes().

This also adds a unit test for this issue.

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Fri, 26 Jun 2015 06:09:47 +0000 (08:09 +0200)]
Merge branch 'collectd-5.5'

Conflicts:
src/write_redis.c

9 years agoMerge remote-tracking branch 'github/pr/1097'
Florian Forster [Thu, 25 Jun 2015 20:37:20 +0000 (22:37 +0200)]
Merge remote-tracking branch 'github/pr/1097'

9 years agoproperly handle error cases when kvm_read fails (#1094)
Landry Breuil [Wed, 24 Jun 2015 04:48:16 +0000 (06:48 +0200)]
properly handle error cases when kvm_read fails (#1094)

9 years agoMerge remote-tracking branch 'github/pr/1093'
Florian Forster [Thu, 25 Jun 2015 20:34:26 +0000 (22:34 +0200)]
Merge remote-tracking branch 'github/pr/1093'

9 years agodon't report inodes if fs doesn't provide f_files and f_ffree
Marek Becka [Wed, 24 Jun 2015 15:39:55 +0000 (11:39 -0400)]
don't report inodes if fs doesn't provide f_files and f_ffree

9 years agowrite_redis plugin: Call freeReplyObject() for each redisReply.
Florian Forster [Thu, 25 Jun 2015 20:18:27 +0000 (22:18 +0200)]
write_redis plugin: Call freeReplyObject() for each redisReply.

9 years agowrite_redis plugin: Use the prefix for the "values" set, too.
Florian Forster [Thu, 25 Jun 2015 20:11:17 +0000 (22:11 +0200)]
write_redis plugin: Use the prefix for the "values" set, too.

Make the code match the documentation and use the prefix for the set of all
metrics, too. Also add documentation for the "Prefix" option and let the
default prefix be set at compile time.

9 years agoMerge remote-tracking branch 'github/pr/1082'
Florian Forster [Thu, 25 Jun 2015 19:40:27 +0000 (21:40 +0200)]
Merge remote-tracking branch 'github/pr/1082'

9 years agoFix signed / unsigned comparison errors.
Florian Forster [Thu, 25 Jun 2015 10:36:42 +0000 (12:36 +0200)]
Fix signed / unsigned comparison errors.

A lot of loop counters need to be size_t now, because values_len and ds_num
are now of that type.

9 years agosrc/daemon/common.c: Add parse_values() unit test.
Florian Forster [Thu, 25 Jun 2015 09:31:19 +0000 (11:31 +0200)]
src/daemon/common.c: Add parse_values() unit test.

9 years agosrc/daemon/plugin.h: Change "values_len" to type "size_t".
Florian Forster [Thu, 25 Jun 2015 09:30:46 +0000 (11:30 +0200)]
src/daemon/plugin.h: Change "values_len" to type "size_t".

9 years agosrc/Makefile.am: Move tests towards the libraries tested.
Florian Forster [Tue, 23 Jun 2015 12:26:55 +0000 (14:26 +0200)]
src/Makefile.am: Move tests towards the libraries tested.

9 years agoremoved separator between prefix and the rest of the key
Sebastian Pfahl [Mon, 15 Jun 2015 14:07:57 +0000 (14:07 +0000)]
removed separator between prefix and the rest of the key

9 years agoRemove unmaintained Fedora contrib files
Ruben Kerkhof [Mon, 22 Jun 2015 19:24:09 +0000 (21:24 +0200)]
Remove unmaintained Fedora contrib files

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Fri, 19 Jun 2015 18:08:24 +0000 (20:08 +0200)]
Merge branch 'collectd-5.5'

9 years agobarometer plugin: Fix "Allocator sizeof operand mismatch" warning.
Florian Forster [Fri, 19 Jun 2015 18:03:08 +0000 (20:03 +0200)]
barometer plugin: Fix "Allocator sizeof operand mismatch" warning.

9 years agowrite_sensu plugin: Fix debug message.
Florian Forster [Fri, 19 Jun 2015 17:27:27 +0000 (19:27 +0200)]
write_sensu plugin: Fix debug message.

It still referenced the variables, which have been removed in
1c4008c3216edbc9c7cbeffd1c597c9b32e8f64d.

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Fri, 19 Jun 2015 14:28:01 +0000 (16:28 +0200)]
Merge branch 'collectd-5.5'

9 years agowrite_sensu plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 14:27:26 +0000 (16:27 +0200)]
write_sensu plugin: Fix memory leak.

9 years agoturbostat plugin: Fix "Undefined allocation of 0 bytes (CERT MEM04-C; CWE-131)" warning.
Florian Forster [Fri, 19 Jun 2015 14:26:53 +0000 (16:26 +0200)]
turbostat plugin: Fix "Undefined allocation of 0 bytes (CERT MEM04-C; CWE-131)" warning.

9 years agoopenvpn plugin: Fix "Dead assignment" warning.
Florian Forster [Fri, 19 Jun 2015 14:26:12 +0000 (16:26 +0200)]
openvpn plugin: Fix "Dead assignment" warning.

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Fri, 19 Jun 2015 13:11:39 +0000 (15:11 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agosrc/utils_cmd_flush.c: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 11:06:34 +0000 (13:06 +0200)]
src/utils_cmd_flush.c: Fix memory leak.

9 years agosrc/utils_rrdcreate.c: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
src/utils_rrdcreate.c: Fix memory leak.

9 years agosrc/utils_ignorelist.c: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
src/utils_ignorelist.c: Fix memory leak.

Turns out, regfree(3) cleans up the memory allocated by regcomp(3), but
not the pointer itself.

9 years agosrc/utils_cmd_putval.c: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
src/utils_cmd_putval.c: Fix memory leak.

9 years agoutils_cache plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
utils_cache plugin: Fix memory leak.

9 years agorrdtool plugin: Add assertion.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
rrdtool plugin: Add assertion.

This helps the static code analysis to figure out that memory is not
leaking after all.

9 years agopowerdns plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
powerdns plugin: Fix memory leak.

While at it, replace the powerdns_config_add_string() function.

9 years agomemcachec plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
memcachec plugin: Fix memory leak.

9 years agojava plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
java plugin: Fix memory leak.

9 years agoipvs plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
ipvs plugin: Fix memory leak.

9 years agogmond plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
gmond plugin: Fix memory leak.

9 years agocurl_xml plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
curl_xml plugin: Fix memory leak.

9 years agocurl_json plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
curl_json plugin: Fix memory leak.

9 years agocurl plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
curl plugin: Fix memory leak.

9 years agocollectdmon: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
collectdmon: Fix memory leak.

9 years agoapache plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
apache plugin: Fix memory leak.

9 years agosrc/utils_cache.c: Fix two memory leaks.
Florian Forster [Fri, 19 Jun 2015 05:05:22 +0000 (07:05 +0200)]
src/utils_cache.c: Fix two memory leaks.

* Free "times" pointer if it is not returned to the user.
* Free (re)alloc'ed pointers when strdup() fails.

9 years agosnmp plugin: Fix "Assigned value is garbage or undefined" warning.
Florian Forster [Thu, 18 Jun 2015 15:46:03 +0000 (17:46 +0200)]
snmp plugin: Fix "Assigned value is garbage or undefined" warning.

9 years agosrc/utils_latency.c: Fix "Assigned value is garbage or undefined" warning.
Florian Forster [Thu, 18 Jun 2015 15:45:52 +0000 (17:45 +0200)]
src/utils_latency.c: Fix "Assigned value is garbage or undefined" warning.

9 years agothreshold plugin: Fix "Dead assignment" warnings.
Florian Forster [Thu, 18 Jun 2015 15:31:03 +0000 (17:31 +0200)]
threshold plugin: Fix "Dead assignment" warnings.

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Thu, 18 Jun 2015 14:55:53 +0000 (16:55 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Thu, 18 Jun 2015 14:52:09 +0000 (16:52 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agomodbus plugin: Make sure variable is initialized.
Florian Forster [Thu, 18 Jun 2015 14:45:23 +0000 (16:45 +0200)]
modbus plugin: Make sure variable is initialized.

This was introduced by the merge
(09c6a320f3cb36b5dbb2c2ce43858f33be7acf9b).

9 years agostats plugin: Link with libm (-lm).
Florian Forster [Thu, 18 Jun 2015 14:09:10 +0000 (16:09 +0200)]
stats plugin: Link with libm (-lm).

Fixes a bug reported by @Tenzer:

    symbol lookup error: /usr/lib/collectd/statsd.so: undefined symbol: log

9 years agotail plugin: Make sure variable is initialized.
Florian Forster [Thu, 18 Jun 2015 13:31:11 +0000 (15:31 +0200)]
tail plugin: Make sure variable is initialized.

This was introduced by the merge
(09c6a320f3cb36b5dbb2c2ce43858f33be7acf9b).

9 years agoFix "Undefined allocation of 0 bytes (CERT MEM04-C; CWE-131)" warnings.
Florian Forster [Thu, 18 Jun 2015 13:27:54 +0000 (15:27 +0200)]
Fix "Undefined allocation of 0 bytes (CERT MEM04-C; CWE-131)" warnings.

9 years agothreshold plugin: Fix "Dead increment" warnings.
Florian Forster [Thu, 18 Jun 2015 12:45:02 +0000 (14:45 +0200)]
threshold plugin: Fix "Dead increment" warnings.

9 years agoFix "Argument with 'nonnull' attribute passed null" warnings.
Florian Forster [Thu, 18 Jun 2015 11:36:02 +0000 (13:36 +0200)]
Fix "Argument with 'nonnull' attribute passed null" warnings.

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Thu, 18 Jun 2015 11:05:23 +0000 (13:05 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Thu, 18 Jun 2015 11:05:14 +0000 (13:05 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agothreshold plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
threshold plugin: Fix "Dead assignment" warning.

9 years agoted plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
ted plugin: Fix "Dead assignment" warning.

9 years agotail_csv plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
tail_csv plugin: Fix "Dead assignment" warning.

9 years agotail plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 08:27:42 +0000 (10:27 +0200)]
tail plugin: Fix "Dead assignment" warning.

9 years agosnmp plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
snmp plugin: Fix "Dead assignment" warning.

9 years agopowerdns plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
powerdns plugin: Fix "Dead assignment" warning.

9 years agoping plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
ping plugin: Fix "Dead assignment" warning.

9 years agoonewire plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 08:25:41 +0000 (10:25 +0200)]
onewire plugin: Fix "Dead assignment" warning.

9 years agoopenvpn plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
openvpn plugin: Fix "Dead assignment" warning.

9 years agontpd plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
ntpd plugin: Fix "Dead assignment" warning.

9 years agonetwork plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
network plugin: Fix "Dead assignment" warning.

9 years agomodbus plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
modbus plugin: Fix "Dead assignment" warning.

9 years agoonewire plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
onewire plugin: Fix "Dead assignment" warning.

9 years agonfs plugin: Fix handling of servers with 42 or 44 fields.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
nfs plugin: Fix handling of servers with 42 or 44 fields.

9 years agobattery plugin: Fix file descriptor leak.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
battery plugin: Fix file descriptor leak.

9 years agosrc/libcollectdclient/client.c: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
src/libcollectdclient/client.c: Fix "Dead assignment" warning.

9 years agogmond plugin: Fix handling of COUNTER and ABSOLUTE data sources.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
gmond plugin: Fix handling of COUNTER and ABSOLUTE data sources.

9 years agoemail plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
email plugin: Fix "Dead assignment" warning.

9 years agosrc/daemon/filter_chain.c: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
src/daemon/filter_chain.c: Fix "Dead assignment" warning.

9 years agocurl_json plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
curl_json plugin: Fix "Dead assignment" warning.

9 years agoamqp plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
amqp plugin: Fix "Dead assignment" warning.

9 years agosrc/utils_avltree.c: Add assertions to rotate_{left,right}().
Florian Forster [Wed, 17 Jun 2015 20:08:19 +0000 (22:08 +0200)]
src/utils_avltree.c: Add assertions to rotate_{left,right}().

clang's static code analysis thought that x->right / x->left could be NULL,
reporting false positives. Let's see if this fixes it.

9 years agosnmp plugin: Fix off-by-one array access.
Florian Forster [Wed, 17 Jun 2015 17:12:45 +0000 (19:12 +0200)]
snmp plugin: Fix off-by-one array access.

9 years agoexec plugin: Don't assign variable that is never read.
Florian Forster [Wed, 17 Jun 2015 15:38:41 +0000 (17:38 +0200)]
exec plugin: Don't assign variable that is never read.

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Wed, 17 Jun 2015 15:29:48 +0000 (17:29 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Wed, 17 Jun 2015 15:29:38 +0000 (17:29 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5