Code

collectd.git
9 years agozone plugin: Fix strerror -> sstrerror.
Florian Forster [Thu, 11 Jun 2015 09:36:12 +0000 (10:36 +0100)]
zone plugin: Fix strerror -> sstrerror.

9 years agozone plugin: Minor code cleanups.
Florian Forster [Thu, 11 Jun 2015 09:17:27 +0000 (10:17 +0100)]
zone plugin: Minor code cleanups.

9 years agozone plugin: Undefine _FILE_OFFSET_BITS when building on 32bit hosts.
Florian Forster [Thu, 11 Jun 2015 09:14:04 +0000 (10:14 +0100)]
zone plugin: Undefine _FILE_OFFSET_BITS when building on 32bit hosts.

Fixes: #1077
9 years agoMerge branch 'collectd-5.5'
Florian Forster [Thu, 11 Jun 2015 06:50:27 +0000 (07:50 +0100)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Thu, 11 Jun 2015 06:50:12 +0000 (07:50 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agodns plugin: Check for "struct ip6_ext".
Florian Forster [Thu, 11 Jun 2015 06:46:54 +0000 (07:46 +0100)]
dns plugin: Check for "struct ip6_ext".

Solaris appears to declare the struct, but only when The Right defines
are specified at compile time. As a quick and dirty fix, only build with
IPv6 support when the struct is usable.

Fixes: #348
9 years agosmart: KNF
Pierre-Yves Ritschard [Wed, 10 Jun 2015 13:54:58 +0000 (15:54 +0200)]
smart: KNF

9 years agoUpdate smart.c
Florian Schüller [Wed, 10 Jun 2015 13:29:31 +0000 (15:29 +0200)]
Update smart.c

Are you sure this doesn't memory-leak?
(I didn't have time to run valgrind but is it possible that this command is missing?)

9 years agosmart: KNF
Pierre-Yves Ritschard [Wed, 10 Jun 2015 13:54:58 +0000 (15:54 +0200)]
smart: KNF

9 years agoMerge pull request #1076 from schuellerf/master
Pierre-Yves Ritschard [Wed, 10 Jun 2015 13:51:53 +0000 (15:51 +0200)]
Merge pull request #1076 from schuellerf/master

Update smart.c

9 years agoUpdate smart.c
Florian Schüller [Wed, 10 Jun 2015 13:29:31 +0000 (15:29 +0200)]
Update smart.c

Are you sure this doesn't memory-leak?
(I didn't have time to run valgrind but is it possible that this command is missing?)

9 years agovmem plugin: fix types for nr_dirtied and nr_written
Marek Becka [Tue, 9 Jun 2015 21:13:29 +0000 (17:13 -0400)]
vmem plugin: fix types for nr_dirtied and nr_written

9 years agotcpconns plugin: Fix memory leak.
Florian Forster [Wed, 10 Jun 2015 07:39:24 +0000 (08:39 +0100)]
tcpconns plugin: Fix memory leak.

"prev" was set to NULL and never updated, leading to "port_list_head" to
be set to an entry later in the list. This leaks memory because earlier
entries in the list are now unreachable.

Fixes: #1074
9 years agotail plugin: initialize user_data_t
Marek Becka [Wed, 10 Jun 2015 01:33:36 +0000 (21:33 -0400)]
tail plugin: initialize user_data_t

9 years agosrc/configfile.c: Set a plugin context when autoloading plugins.
Florian Forster [Wed, 10 Jun 2015 06:55:02 +0000 (07:55 +0100)]
src/configfile.c: Set a plugin context when autoloading plugins.

Fixes: #1069
9 years agosrc/daemon/configfile.c: Remove unnecessary "continue" statements.
Florian Forster [Tue, 9 Jun 2015 17:21:13 +0000 (18:21 +0100)]
src/daemon/configfile.c: Remove unnecessary "continue" statements.

9 years agoMerge remote-tracking branch 'github/pr/1067'
Florian Forster [Tue, 9 Jun 2015 17:10:55 +0000 (18:10 +0100)]
Merge remote-tracking branch 'github/pr/1067'

9 years agoplugin: not return -1 if plugin_flush_callback_name fails
Manuel Luis Sanmartín Rozada [Mon, 8 Jun 2015 19:36:05 +0000 (21:36 +0200)]
plugin: not return -1 if plugin_flush_callback_name fails

9 years agoDo not call plugin_unregister if the read registration fails.
Manuel Luis Sanmartín Rozada [Mon, 8 Jun 2015 19:31:38 +0000 (21:31 +0200)]
Do not call plugin_unregister if the read registration fails.

9 years agoplugin: fix white space.
Manuel Luis Sanmartín Rozada [Mon, 8 Jun 2015 19:25:15 +0000 (21:25 +0200)]
plugin: fix white space.

9 years agoplugin: remove cast type information from malloc.
Manuel Luis Sanmartín Rozada [Mon, 8 Jun 2015 19:21:44 +0000 (21:21 +0200)]
plugin: remove cast type information from malloc.

9 years agoplugin: move the code to create flush/name to plugin_flush_callback_name
Manuel Luis Sanmartín Rozada [Mon, 8 Jun 2015 19:12:52 +0000 (21:12 +0200)]
plugin: move the code to create flush/name to plugin_flush_callback_name

9 years agoapcups plugin: Implement the "PersistentConnection" option.
Florian Forster [Mon, 8 Jun 2015 10:36:04 +0000 (12:36 +0200)]
apcups plugin: Implement the "PersistentConnection" option.

If set to false, close the connection after each interval. This lets
users chose this method if persistent connections pose a problem.

Fixes: #617
9 years agoapcups plugin: Handle "END APC" lines correctly and stop reading.
Florian Forster [Mon, 8 Jun 2015 10:34:41 +0000 (12:34 +0200)]
apcups plugin: Handle "END APC" lines correctly and stop reading.

Fixes: #617
9 years agoapcups plugin: Fight code rot.
Florian Forster [Mon, 8 Jun 2015 10:33:49 +0000 (12:33 +0200)]
apcups plugin: Fight code rot.

* Use the cleaner "complex" config and the cf_util_* functions.
* Rename "host" and "port" to "node" and "service".
  Use cf_util_get_service() so users may specify services as string.
* Remove unused defines.

9 years agoSupport for call the flush callback at regular intervals using
Manuel Luis Sanmartín Rozada [Sun, 7 Jun 2015 22:49:20 +0000 (00:49 +0200)]
Support for call the flush callback at regular intervals using
the read plugin callback.

9 years agovarnish: update plugin_register_complex_read() to new default value
Marc Fournier [Sun, 7 Jun 2015 14:21:37 +0000 (16:21 +0200)]
varnish: update plugin_register_complex_read() to new default value

... just a follow up to cce136946b, in which one of the two
plugin_register_complex_read() calls got missed out.

9 years agoprocesses: revert re-introduction of ps_read_tasks
Arthur Gautier [Sat, 6 Jun 2015 21:06:25 +0000 (21:06 +0000)]
processes: revert re-introduction of ps_read_tasks

This commit partially revert 30eeeee996124de666f907877f8196e5580101ed
which solved incorrectly the merge conflict

Signed-off-by: Arthur Gautier <baloo@gandi.net>
9 years agosrc/daemon/plugin.[ch]: Use cdtime_t for the interval argument of "register complex...
Florian Forster [Sat, 6 Jun 2015 20:33:34 +0000 (22:33 +0200)]
src/daemon/plugin.[ch]: Use cdtime_t for the interval argument of "register complex read".

All plugins converted to "struct timespec", just so that
plugin_register_complex_read() would convert back to cdtime_t again. This patch
removed this crazyness; the new "determine automatically" value is zero (used
to be NULL).

9 years agoMerge remote-tracking branch 'github/pr/1036'
Florian Forster [Sat, 6 Jun 2015 19:43:28 +0000 (21:43 +0200)]
Merge remote-tracking branch 'github/pr/1036'

Conflicts:
src/processes.c

9 years agoMerge branch 'pr/1033'
Florian Forster [Sat, 6 Jun 2015 19:39:16 +0000 (21:39 +0200)]
Merge branch 'pr/1033'

9 years agoprocesses plugin: Read number of threads from /proc/$pid/stat as a fallback.
Florian Forster [Sat, 6 Jun 2015 19:37:00 +0000 (21:37 +0200)]
processes plugin: Read number of threads from /proc/$pid/stat as a fallback.

Should reading the number of threads from /prod/$pid/status fail, use the
number provided by /prod/$pid/stat as a fallback. If that fails, too, use 1.

As discussed with @manuelluis in #1033.

9 years agostatsd plugin: Dispatch NaN when no timer event was recorded.
Florian Forster [Sat, 6 Jun 2015 19:22:25 +0000 (21:22 +0200)]
statsd plugin: Dispatch NaN when no timer event was recorded.

This makes timing events appear faster when writing to RRD files.

Fixes: #1038, #1049
9 years agoFix VERSION->PACKAGE_VERSION and PACKAGE->PACKAGE_NAME so they're always defined
Nathan Berkley [Fri, 5 Jun 2015 20:46:46 +0000 (16:46 -0400)]
Fix VERSION->PACKAGE_VERSION and PACKAGE->PACKAGE_NAME so they're always defined

9 years agoFix header condition
Dagobert Michelsen [Thu, 4 Jun 2015 11:25:48 +0000 (13:25 +0200)]
Fix header condition

The dependency is either UTMPX or UTMP or Statgrab. The inclusion above hasn't statgrab.h in the elif-chain, that means compilation fails when only libstatgrab is available. The line can safely be taken out as the same condition is checked in #L120.

9 years agoRemove old systemd unit
Chris Mayo [Sat, 6 Jun 2015 16:35:02 +0000 (17:35 +0100)]
Remove old systemd unit

collectd.service superseded by systemd.collectd.service

9 years agoMerge remote-tracking branch 'github/pr/1056'
Florian Forster [Mon, 1 Jun 2015 17:15:58 +0000 (19:15 +0200)]
Merge remote-tracking branch 'github/pr/1056'

9 years agotail_csv plugin: Print warning and continue when metric is not found.
Florian Forster [Sun, 31 May 2015 20:54:47 +0000 (22:54 +0200)]
tail_csv plugin: Print warning and continue when metric is not found.

Previously, when multiple metrics were specified on one "Collect" line and one
didn't exist, all *following* metrics would be ignored. This patch changes this
to continue in this case and configure as many metrics as possible.

9 years agoPlugin network: add support for the timeout argument in the flush callback
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 20:46:11 +0000 (22:46 +0200)]
Plugin network: add support for the timeout argument in the flush callback

9 years agoPlugin tail_csv: the manual says that you can use multiple times the
Manuel Luis Sanmartín Rozada [Wed, 20 May 2015 18:52:58 +0000 (20:52 +0200)]
Plugin tail_csv: the manual says that you can use multiple times the
Collect option but the code expecs t"Collect n1 n2 n3 n4", fix
to allow to put the option Collect multiple times.

9 years agoPlugin tail_csv: if TimeFrom is not specified in config file
Manuel Luis Sanmartín Rozada [Wed, 20 May 2015 18:37:16 +0000 (20:37 +0200)]
Plugin tail_csv: if TimeFrom is not specified in config file
the default value for time_from is -1 and the type of fileds_num
is size_t, so the comparsion of signed and unsigned not work as espected

9 years agoprocesses: change type to contextswitch and types to derive_t
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 19:19:16 +0000 (21:19 +0200)]
processes: change type to contextswitch and types to derive_t

9 years agoprocesses: use cf_util_get_boolean for get "CollectContextSwitch"
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 18:56:49 +0000 (20:56 +0200)]
processes: use cf_util_get_boolean for get "CollectContextSwitch"

9 years agoprocesses: delete added white spaces
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 18:49:58 +0000 (20:49 +0200)]
processes: delete added white spaces

9 years agoprocesses: rename ps_ctx_switch to report_ctx_switch
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 18:48:27 +0000 (20:48 +0200)]
processes: rename ps_ctx_switch to report_ctx_switch

9 years agoprocesses: remove function ps_read_tasks
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 18:25:31 +0000 (20:25 +0200)]
processes: remove function ps_read_tasks

9 years agoProcesses: fix types in ps_read_status, change to unsigned long.
Manuel Luis Sanmartín Rozada [Sat, 30 May 2015 23:34:30 +0000 (01:34 +0200)]
Processes: fix types in ps_read_status, change to unsigned long.

9 years agoProcesses: in ps_read_status fix check to skip lines
Manuel Luis Sanmartín Rozada [Sat, 30 May 2015 22:52:18 +0000 (00:52 +0200)]
Processes: in ps_read_status fix check to skip lines
if it doesn't start with "Vm" and it doesn't start "Threads".

9 years agostats plugin: Fix reference of undeclared symbol.
Florian Forster [Sat, 30 May 2015 21:17:53 +0000 (23:17 +0200)]
stats plugin: Fix reference of undeclared symbol.

Issue: #997

9 years agostatsd plugin: Free latency counter and AVL trees.
Florian Forster [Sat, 30 May 2015 21:13:42 +0000 (23:13 +0200)]
statsd plugin: Free latency counter and AVL trees.

latency counters (used by TIMER metrics) and AVL trees (used by SET metrics)
were not freed when cleaning up unused metrics. This resulted in leaked memory.

Fixes: #997
9 years agocpu plugin: Correct number of expected CPU states on Mac OS X.
Robert Viduya [Fri, 29 May 2015 21:47:21 +0000 (17:47 -0400)]
cpu plugin: Correct number of expected CPU states on Mac OS X.

This appears to be a regression introduced in f14ab935. Thanks to Robert Viduya
for reporting the bug.

Signed-off-by: Florian Forster <octo@collectd.org>
9 years agozone: add mentions to README and AUTHORS files
Marc Fournier [Thu, 28 May 2015 19:06:52 +0000 (21:06 +0200)]
zone: add mentions to README and AUTHORS files

9 years agoRPM specfile: handle new zone plugin
Marc Fournier [Thu, 28 May 2015 19:06:29 +0000 (21:06 +0200)]
RPM specfile: handle new zone plugin

9 years agoMerge remote-tracking branch 'origin/collectd-5.3' into collectd-5.4
Marc Fournier [Thu, 28 May 2015 18:21:55 +0000 (20:21 +0200)]
Merge remote-tracking branch 'origin/collectd-5.3' into collectd-5.4

9 years agoMerge remote-tracking branch 'github/pr/1054'
Florian Forster [Thu, 28 May 2015 12:09:35 +0000 (14:09 +0200)]
Merge remote-tracking branch 'github/pr/1054'

9 years agoMake flow more obvious
Dagobert Michelsen [Thu, 28 May 2015 12:02:16 +0000 (14:02 +0200)]
Make flow more obvious

9 years agoAdd myself
Dagobert Michelsen [Thu, 28 May 2015 11:27:59 +0000 (13:27 +0200)]
Add myself

9 years agoNo busy looping around open()
Dagobert Michelsen [Thu, 28 May 2015 11:24:41 +0000 (13:24 +0200)]
No busy looping around open()

9 years agoUse sizeof() instead of duplicating the variable length
Dagobert Michelsen [Thu, 28 May 2015 11:22:29 +0000 (13:22 +0200)]
Use sizeof() instead of duplicating the variable length

9 years agoHandle case when zone_scandir() returns NULL
Dagobert Michelsen [Thu, 28 May 2015 11:19:02 +0000 (13:19 +0200)]
Handle case when zone_scandir() returns NULL

9 years agoReturn -1 in zone_read on error
Dagobert Michelsen [Thu, 28 May 2015 11:15:59 +0000 (13:15 +0200)]
Return -1 in zone_read on error

9 years agoGet pagesize only once during initialization
Dagobert Michelsen [Thu, 28 May 2015 11:14:26 +0000 (13:14 +0200)]
Get pagesize only once during initialization

9 years agoHandle case when zone_find_stats() returns NULL
Dagobert Michelsen [Thu, 28 May 2015 11:09:49 +0000 (13:09 +0200)]
Handle case when zone_find_stats() returns NULL

9 years agoUse ZONENAME_MAX and handle errors returned by getzonenamebyid()
Dagobert Michelsen [Thu, 28 May 2015 11:06:04 +0000 (13:06 +0200)]
Use ZONENAME_MAX and handle errors returned by getzonenamebyid()

9 years agoPrefix all warnings and error messages with plugin name
Dagobert Michelsen [Thu, 28 May 2015 10:54:11 +0000 (12:54 +0200)]
Prefix all warnings and error messages with plugin name

9 years agoUse (void *) in c_avl_create()
Dagobert Michelsen [Thu, 28 May 2015 10:51:26 +0000 (12:51 +0200)]
Use (void *) in c_avl_create()

9 years agoUse type 'percent' instead of 'zone_cpu'
Dagobert Michelsen [Thu, 28 May 2015 10:47:27 +0000 (12:47 +0200)]
Use type 'percent' instead of 'zone_cpu'

9 years agoupdate changelog + bump release dates collectd-5.5.0
Marc Fournier [Wed, 27 May 2015 07:41:36 +0000 (09:41 +0200)]
update changelog + bump release dates

9 years agoBuild system: Fix linking with libheap.la and depend on testing.h.
Florian Forster [Tue, 26 May 2015 19:43:10 +0000 (21:43 +0200)]
Build system: Fix linking with libheap.la and depend on testing.h.

collectd-tg tried to link with libheap.a (instead of ….la), which
doesn't exist. testing.h was not mentioned by any target, leading to it
being missing form the tarballs.

9 years agoBuild system: Build tested units as libraries.
Florian Forster [Tue, 26 May 2015 06:52:39 +0000 (08:52 +0200)]
Build system: Build tested units as libraries.

This simplifies the build rules for the tests, aka. check programs.

* test_foo.c have been renamed to foo_test.c.
* foo_test.c now reside right next to foo.c and foo.h.
* Build and refer to .la files, rather than depending on .c files from
  other directories.

Fixes: #1042
9 years agoFilter chains helper: minor cleanups
Marc Fournier [Tue, 26 May 2015 13:41:47 +0000 (15:41 +0200)]
Filter chains helper: minor cleanups

This is a couple of trivial followups to 809a8973.

9 years agowrite_redis: Replaced method for checking for a NULL value for the redis connection
root [Wed, 20 May 2015 19:17:10 +0000 (14:17 -0500)]
write_redis: Replaced method for checking for a NULL value for the redis connection

9 years agowrite_redis: Log error message from redis command failures
root [Wed, 20 May 2015 15:46:26 +0000 (10:46 -0500)]
write_redis: Log error message from redis command failures

9 years agowrite_redis: improve checking the redis connection
root [Wed, 20 May 2015 14:38:23 +0000 (09:38 -0500)]
write_redis: improve checking the redis connection

9 years agoFilterchain: if we don't find a writer, output the available writers to syslog.
Wilfried Goesgens [Sat, 23 May 2015 13:44:24 +0000 (15:44 +0200)]
Filterchain: if we don't find a writer, output the available writers to syslog.

9 years agobindings/java/Makefile.am: Add "uninstall-local" target.
Florian Forster [Sat, 23 May 2015 09:01:19 +0000 (11:01 +0200)]
bindings/java/Makefile.am: Add "uninstall-local" target.

Otherwise "make distcheck" will complain about leftover files.

9 years agobindings/java/Makefile.am: Use $(srcdir) when specifying dependencies.
Florian Forster [Sat, 23 May 2015 09:00:38 +0000 (11:00 +0200)]
bindings/java/Makefile.am: Use $(srcdir) when specifying dependencies.

This fixes out-of-tree builds, like "make distcheck" does.

9 years agobindings/java/Makefile.am: Add "uninstall-local" target.
Florian Forster [Sat, 23 May 2015 09:01:19 +0000 (11:01 +0200)]
bindings/java/Makefile.am: Add "uninstall-local" target.

Otherwise "make distcheck" will complain about leftover files.

9 years agobindings/java/Makefile.am: Use $(srcdir) when specifying dependencies.
Florian Forster [Sat, 23 May 2015 09:00:38 +0000 (11:00 +0200)]
bindings/java/Makefile.am: Use $(srcdir) when specifying dependencies.

This fixes out-of-tree builds, like "make distcheck" does.

9 years agoChangeLog: Update date to 2015-05-22.
Florian Forster [Fri, 22 May 2015 11:32:00 +0000 (13:32 +0200)]
ChangeLog: Update date to 2015-05-22.

9 years agowrite_sensu, write_tsdb plugins: Use GAUGE_FORMAT.
Florian Forster [Fri, 22 May 2015 09:48:17 +0000 (11:48 +0200)]
write_sensu, write_tsdb plugins: Use GAUGE_FORMAT.

Issue #1039

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Fri, 22 May 2015 09:33:27 +0000 (11:33 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

Conflicts:
src/write_redis.c

9 years agowrite_redis: Fix timestamp sent to Redis.
Florian Forster [Fri, 22 May 2015 09:29:12 +0000 (11:29 +0200)]
write_redis: Fix timestamp sent to Redis.

9 years agoVarious plugins: Use the global GAUGE_FORMAT.
Florian Forster [Fri, 22 May 2015 09:25:01 +0000 (11:25 +0200)]
Various plugins: Use the global GAUGE_FORMAT.

This fixes the postgresql, rrdtool, target_notification, write_graphite and
write_redis plugins to use the globally defined format for gauges.

Issue #1039

9 years agosrc/collectd.h: Define GAUGE_FORMAT.
Florian Forster [Fri, 22 May 2015 09:11:27 +0000 (11:11 +0200)]
src/collectd.h: Define GAUGE_FORMAT.

This format is also used in format_values(), so exported gauges follow a common
format.

See also issue #1039

9 years agosrc/utils_format_json.[ch]: Export gauges with 15 decimal places of precision.
Florian Forster [Fri, 22 May 2015 08:25:35 +0000 (10:25 +0200)]
src/utils_format_json.[ch]: Export gauges with 15 decimal places of precision.

Fixes: #1039
9 years agoChangeLog: Import changes from the wiki.
Florian Forster [Thu, 21 May 2015 11:59:49 +0000 (13:59 +0200)]
ChangeLog: Import changes from the wiki.

9 years agoRPM specfile: fix changelog formatting
Marc Fournier [Wed, 20 May 2015 21:37:53 +0000 (23:37 +0200)]
RPM specfile: fix changelog formatting

9 years agoRPM specfile: also bump release number
Marc Fournier [Wed, 20 May 2015 20:40:52 +0000 (22:40 +0200)]
RPM specfile: also bump release number

9 years agoRPM specfile: update changelog for 5.5
Marc Fournier [Wed, 20 May 2015 20:35:42 +0000 (22:35 +0200)]
RPM specfile: update changelog for 5.5

9 years agoPlugin process: collect voluntary and involuntary context switches.
Manuel Luis Sanmartín Rozada [Wed, 20 May 2015 20:37:41 +0000 (22:37 +0200)]
Plugin process: collect voluntary  and involuntary context switches.

9 years agocontrib/wiki2changelog.pl: Add script converting from wiki to ChangeLog.
Florian Forster [Wed, 20 May 2015 20:25:28 +0000 (22:25 +0200)]
contrib/wiki2changelog.pl: Add script converting from wiki to ChangeLog.

9 years agoChangeLog: Change text width to 80 characters.
Florian Forster [Wed, 20 May 2015 20:18:05 +0000 (22:18 +0200)]
ChangeLog: Change text width to 80 characters.

9 years agoBump version to 5.5.0; Update ChangeLog.
Florian Forster [Wed, 20 May 2015 20:13:38 +0000 (22:13 +0200)]
Bump version to 5.5.0; Update ChangeLog.

9 years agoipc plugin: Group functions by operating system.
Florian Forster [Wed, 20 May 2015 20:08:50 +0000 (22:08 +0200)]
ipc plugin: Group functions by operating system.

9 years agoPlugin process: in Linux read the number of threads from
Manuel Luis Sanmartín Rozada [Wed, 20 May 2015 17:15:37 +0000 (19:15 +0200)]
Plugin process: in Linux read the number of threads from
/proc/pid/status instead of counter the number of files in
/proc/pid/task/*.

9 years agoMerge branch 'collectd-5.4'
Marc Fournier [Tue, 19 May 2015 20:44:27 +0000 (22:44 +0200)]
Merge branch 'collectd-5.4'

9 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Tue, 19 May 2015 20:44:15 +0000 (22:44 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4

9 years agoMerge branch 'collectd-4.10' into collectd-5.3
Marc Fournier [Tue, 19 May 2015 16:37:19 +0000 (18:37 +0200)]
Merge branch 'collectd-4.10' into collectd-5.3

9 years agocurl_xml: fix 3 small memory leaks
Marc Fournier [Tue, 12 May 2015 20:14:23 +0000 (22:14 +0200)]
curl_xml: fix 3 small memory leaks

Discovered while testing the previous 2 commits. NB: valgrind
already complained about these before 0afea606 was applied, so this
isn't related to issue #935.