Code

collectd.git
8 years agotail_csv: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:20:59 +0000 (18:20 +0200)]
tail_csv: malloc + memset -> calloc

8 years agostatsd plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:19:59 +0000 (18:19 +0200)]
statsd plugin: malloc + memset -> calloc

8 years agosnmp plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:19:18 +0000 (18:19 +0200)]
snmp plugin: malloc + memset -> calloc

8 years agosigrok plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:16:28 +0000 (18:16 +0200)]
sigrok plugin: malloc + memset -> calloc

8 years agosensors plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:15:44 +0000 (18:15 +0200)]
sensors plugin: malloc + memset -> calloc

8 years agorouteros plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:13:59 +0000 (18:13 +0200)]
routeros plugin: malloc + memset -> calloc

8 years agopython plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:12:46 +0000 (18:12 +0200)]
python plugin: malloc + memset -> calloc

8 years agoprocesses plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:11:57 +0000 (18:11 +0200)]
processes plugin: malloc + memset -> calloc

8 years agopowerdns plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:10:07 +0000 (18:10 +0200)]
powerdns plugin: malloc + memset -> calloc

8 years agopostgresql plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:09:08 +0000 (18:09 +0200)]
postgresql plugin: malloc + memset -> calloc

8 years agopinba plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:04:51 +0000 (18:04 +0200)]
pinba plugin: malloc + memset -> calloc

8 years agooracle plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:03:50 +0000 (18:03 +0200)]
oracle plugin: malloc + memset -> calloc

8 years agoopenldap plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 16:02:18 +0000 (18:02 +0200)]
openldap plugin: malloc + memset -> calloc

8 years agonut plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:59:27 +0000 (17:59 +0200)]
nut plugin: malloc + memset -> calloc

8 years agonetwork plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:55:19 +0000 (17:55 +0200)]
network plugin: malloc + memset -> calloc

8 years agonetlink plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:22:16 +0000 (17:22 +0200)]
netlink plugin: malloc + memset -> calloc

8 years agonetapp plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:21:26 +0000 (17:21 +0200)]
netapp plugin: malloc + memset -> calloc

8 years agomysql plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:18:42 +0000 (17:18 +0200)]
mysql plugin: malloc + memset -> calloc

8 years agomodbus plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:12:14 +0000 (17:12 +0200)]
modbus plugin: malloc + memset -> calloc

8 years agomemcached plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:11:17 +0000 (17:11 +0200)]
memcached plugin: malloc + memset -> calloc

8 years agomemcachec plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:10:05 +0000 (17:10 +0200)]
memcachec plugin: malloc + memset -> calloc

8 years agomatch plugins: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:09:12 +0000 (17:09 +0200)]
match plugins: malloc + memset -> calloc

8 years agoliboconfig: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 15:02:13 +0000 (17:02 +0200)]
liboconfig: malloc + memset -> calloc

8 years agolibcollectdclient: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 14:51:57 +0000 (16:51 +0200)]
libcollectdclient: malloc + memset -> calloc

8 years agojava plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 14:49:35 +0000 (16:49 +0200)]
java plugin: malloc + memset -> calloc

8 years agogmond: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 14:29:53 +0000 (16:29 +0200)]
gmond: malloc + memset -> calloc

8 years agofilecount plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 14:01:27 +0000 (16:01 +0200)]
filecount plugin: malloc + memset -> calloc

8 years agoexec plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 14:00:53 +0000 (16:00 +0200)]
exec plugin: malloc + memset -> calloc

8 years agoethstat plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 13:59:07 +0000 (15:59 +0200)]
ethstat plugin: malloc + memset -> calloc

8 years agoemail plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 13:50:42 +0000 (15:50 +0200)]
email plugin: malloc + memset -> calloc

8 years agodns plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 13:49:57 +0000 (15:49 +0200)]
dns plugin: malloc + memset -> calloc

8 years agodbi plugin: malloc + memset -> calloc
Ruben Kerkhof [Fri, 1 Apr 2016 13:49:04 +0000 (15:49 +0200)]
dbi plugin: malloc + memset -> calloc

8 years agodaemon: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:56:13 +0000 (19:56 +0200)]
daemon: malloc + memset -> calloc

8 years agocurl_xml: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:50:51 +0000 (19:50 +0200)]
curl_xml: malloc + memset -> calloc

8 years agocurl_json: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:50:38 +0000 (19:50 +0200)]
curl_json: malloc + memset -> calloc

8 years agocurl: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:42:36 +0000 (19:42 +0200)]
curl: malloc + memset -> calloc

8 years agocollectd-tg: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:40:31 +0000 (19:40 +0200)]
collectd-tg: malloc + memset -> calloc

8 years agoapache: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:40:12 +0000 (19:40 +0200)]
apache: malloc + memset -> calloc

8 years agoamqp: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:32:51 +0000 (19:32 +0200)]
amqp: malloc + memset -> calloc

8 years agoaggregration: malloc + memset -> calloc
Ruben Kerkhof [Mon, 28 Mar 2016 17:31:17 +0000 (19:31 +0200)]
aggregration: malloc + memset -> calloc

8 years agotreewide: fix a few error messages
Ruben Kerkhof [Mon, 28 Mar 2016 17:24:17 +0000 (19:24 +0200)]
treewide: fix a few error messages

Don't log that malloc failed when we call calloc

8 years agotreewide: cleanup malloc calls
Ruben Kerkhof [Mon, 28 Mar 2016 17:12:10 +0000 (19:12 +0200)]
treewide: cleanup malloc calls

- Remove unnecessary casts
- Use the size of the variable for mallocs size

8 years agonetwork.c: s/networt/network/g
Ruben Kerkhof [Mon, 28 Mar 2016 10:38:17 +0000 (12:38 +0200)]
network.c: s/networt/network/g

8 years agoMerge pull request #1592 from rpv-tomsk/mysql-plugin-sort
Ruben Kerkhof [Sat, 26 Mar 2016 20:24:13 +0000 (21:24 +0100)]
Merge pull request #1592 from rpv-tomsk/mysql-plugin-sort

mysql plugin: Split 'mysql_sort' type into several types.

8 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Sat, 26 Mar 2016 18:55:29 +0000 (19:55 +0100)]
Merge branch 'collectd-5.5'

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sat, 26 Mar 2016 18:31:34 +0000 (19:31 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

8 years agoconfigure.ac: break long line and sort
Ruben Kerkhof [Sat, 26 Mar 2016 18:28:27 +0000 (19:28 +0100)]
configure.ac: break long line and sort

This will make future merges easier.

8 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Sat, 26 Mar 2016 18:12:20 +0000 (19:12 +0100)]
Merge branch 'collectd-5.5'

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sat, 26 Mar 2016 18:11:32 +0000 (19:11 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

8 years agoFix building with xfsprogs 4.5.0
Ruben Kerkhof [Sat, 26 Mar 2016 17:18:44 +0000 (18:18 +0100)]
Fix building with xfsprogs 4.5.0

xfsprogs 4.5.0 started to use off64_t in its headers,
which is hidden behind _GNU_SOURCE

Fixes #1637

8 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Sat, 26 Mar 2016 13:24:02 +0000 (14:24 +0100)]
Merge branch 'collectd-5.5'

8 years agomysql plugin: remove unused declaration
Ruben Kerkhof [Sat, 26 Mar 2016 12:59:26 +0000 (13:59 +0100)]
mysql plugin: remove unused declaration

This was left behind after commit c17582c

8 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Sun, 20 Mar 2016 11:29:06 +0000 (12:29 +0100)]
Merge branch 'collectd-5.5'

8 years agoFix conflict markers
Ruben Kerkhof [Sun, 20 Mar 2016 11:22:21 +0000 (12:22 +0100)]
Fix conflict markers

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sun, 20 Mar 2016 11:04:20 +0000 (12:04 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

8 years agoFix indentation in previous commit
Ruben Kerkhof [Sun, 20 Mar 2016 10:53:13 +0000 (11:53 +0100)]
Fix indentation in previous commit

8 years agoMerge pull request #1620 from skinowski/write_http_mem_leak_II
Ruben Kerkhof [Sun, 20 Mar 2016 10:29:28 +0000 (11:29 +0100)]
Merge pull request #1620 from skinowski/write_http_mem_leak_II

write_http: in cleanup handler free http headers

8 years agowrite_http: in cleanup handler free http headers
Tolga Ceylan [Sun, 20 Mar 2016 02:03:31 +0000 (19:03 -0700)]
write_http: in cleanup handler free http headers

slist of http headers require cleanup to avoid
memory leak. See libcurl example:

https://curl.haxx.se/libcurl/c/httpcustomheader.html

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sat, 19 Mar 2016 15:47:33 +0000 (16:47 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

8 years agoFix build on Solaris 10 i386 part 2
Ruben Kerkhof [Fri, 18 Mar 2016 12:22:58 +0000 (13:22 +0100)]
Fix build on Solaris 10 i386 part 2

utils_latency.c needs the same fix as applied in a41f312

(cherry picked from commit e7f7ecc1cac73841cdebd7e0462af4989532a107)

8 years agoFix build on Solaris 10 i386
Ruben Kerkhof [Fri, 18 Mar 2016 11:59:03 +0000 (12:59 +0100)]
Fix build on Solaris 10 i386

AC_SYS_LARGEFILE defines _FILE_OFFSET_BITS in src/config.h,
so we need this header first before including system headers.

Thanks to @dago for the report.

Fixes:
  CC       collectd-utils_random.o
In file included from collectd.h:31:0,
                 from utils_random.c:29:
../../src/config.h:1646:0: error: "_FILE_OFFSET_BITS" redefined
[-Werror]
 #define _FILE_OFFSET_BITS 64
 ^
In file included from
/opt/csw/lib/gcc/i386-pc-solaris2.10/5.2.0/include-fixed/pthread.h:20:0,
                 from utils_random.c:27:
/opt/csw/lib/gcc/i386-pc-solaris2.10/5.2.0/include-fixed/sys/feature_tests.h:196:0:
note: this is the location of the previous definition
 #define _FILE_OFFSET_BITS 32
 ^
cc1: all warnings being treated as errors

(cherry picked from commit a41f312a8d48a989dfba00a8b43532c60f67caba)

8 years agoMerge branch 'collectd-5.5'
Marc Fournier [Sat, 19 Mar 2016 15:44:30 +0000 (16:44 +0100)]
Merge branch 'collectd-5.5'

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Sat, 19 Mar 2016 15:44:05 +0000 (16:44 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

8 years ago RPM specfile: fix xmms plugin build condition
Marc Fournier [Sat, 19 Mar 2016 07:24:43 +0000 (08:24 +0100)]
 RPM specfile: fix xmms plugin build condition

8 years agoMerge branch 'collectd-5.5'
Marc Fournier [Fri, 18 Mar 2016 22:46:27 +0000 (23:46 +0100)]
Merge branch 'collectd-5.5'

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Fri, 18 Mar 2016 22:44:17 +0000 (23:44 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

8 years agoRPM specfile: update changelog
Marc Fournier [Fri, 18 Mar 2016 22:07:02 +0000 (23:07 +0100)]
RPM specfile: update changelog

8 years agoRPM specfile: enable xmms plugin on EL7
Marc Fournier [Fri, 18 Mar 2016 21:53:59 +0000 (22:53 +0100)]
RPM specfile: enable xmms plugin on EL7

8 years agostatgrab: Save LDFLAGS before changing them.
Ruben Kerkhof [Fri, 18 Mar 2016 12:38:04 +0000 (13:38 +0100)]
statgrab: Save LDFLAGS before changing them.

We did restore them after the test but forget to save them before it.

8 years agoFix build on Solaris 10 i386 part 2
Ruben Kerkhof [Fri, 18 Mar 2016 12:22:58 +0000 (13:22 +0100)]
Fix build on Solaris 10 i386 part 2

utils_latency.c needs the same fix as applied in a41f312

8 years agoRemove warning when we don't have clock_gettime
Ruben Kerkhof [Fri, 18 Mar 2016 12:07:13 +0000 (13:07 +0100)]
Remove warning when we don't have clock_gettime

8 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Fri, 18 Mar 2016 12:04:19 +0000 (13:04 +0100)]
Merge branch 'collectd-5.5'

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 18 Mar 2016 12:03:37 +0000 (13:03 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

8 years agoFix build on Solaris 10 i386
Ruben Kerkhof [Fri, 18 Mar 2016 11:59:03 +0000 (12:59 +0100)]
Fix build on Solaris 10 i386

AC_SYS_LARGEFILE defines _FILE_OFFSET_BITS in src/config.h,
so we need this header first before including system headers.

Thanks to @dago for the report.

Fixes:
  CC       collectd-utils_random.o
In file included from collectd.h:31:0,
                 from utils_random.c:29:
../../src/config.h:1646:0: error: "_FILE_OFFSET_BITS" redefined
[-Werror]
 #define _FILE_OFFSET_BITS 64
 ^
In file included from
/opt/csw/lib/gcc/i386-pc-solaris2.10/5.2.0/include-fixed/pthread.h:20:0,
                 from utils_random.c:27:
/opt/csw/lib/gcc/i386-pc-solaris2.10/5.2.0/include-fixed/sys/feature_tests.h:196:0:
note: this is the location of the previous definition
 #define _FILE_OFFSET_BITS 32
 ^
cc1: all warnings being treated as errors

8 years agoRPM specfile: re-enable memcachec plugin on EL7
Marc Fournier [Fri, 18 Mar 2016 09:16:34 +0000 (10:16 +0100)]
RPM specfile: re-enable memcachec plugin on EL7

cf https://bugzilla.redhat.com/show_bug.cgi?id=1116949

8 years agoRPM specfile: enable modbus plugin on EL7
Marc Fournier [Fri, 18 Mar 2016 09:13:48 +0000 (10:13 +0100)]
RPM specfile: enable modbus plugin on EL7

8 years agoMerge pull request #1617 from michaelsalmon/putval-time-exec-pod
Ruben Kerkhof [Thu, 17 Mar 2016 19:22:15 +0000 (20:22 +0100)]
Merge pull request #1617 from michaelsalmon/putval-time-exec-pod

added definition of N to collectd-exec

8 years agoadded definition of N to collectd-exec
Michael Salmon [Thu, 17 Mar 2016 13:18:04 +0000 (14:18 +0100)]
added definition of N to collectd-exec

8 years agoonewire plugin: fix one more compiler warning
Ruben Kerkhof [Sun, 13 Mar 2016 11:46:31 +0000 (12:46 +0100)]
onewire plugin: fix one more compiler warning

comparison of integers of different signs: 'int' and 'unsigned long'

8 years agoIPC: hopefully fix compiling under AIX
Ruben Kerkhof [Sat, 12 Mar 2016 21:50:09 +0000 (22:50 +0100)]
IPC: hopefully fix compiling under AIX

This code couldn't possibly have compiled.

Found by cppcheck:
[src/ipc.c:285]: (error) Invalid number of character '{' when these
macros are defined: 'KERNEL_AIX'.

8 years agoonewire plugin: fix two compiler warnings
Ruben Kerkhof [Sat, 12 Mar 2016 16:30:58 +0000 (17:30 +0100)]
onewire plugin: fix two compiler warnings

onewire.c:418:31: warning: comparison of integers of different signs:
'int' and 'unsigned long' [-Wsign-compare]
  if ((status > 0) && (status < sizeof (subpath)))
                       ~~~~~~ ^ ~~~~~~~~~~~~~~~~
onewire.c:422:31: warning: comparison of integers of different signs:
'int' and 'unsigned long' [-Wsign-compare]
  if ((status > 0) && (status < sizeof (subpath)))
                       ~~~~~~ ^ ~~~~~~~~~~~~~~~~

8 years agoutils_subst_test.c: constify
Ruben Kerkhof [Sat, 12 Mar 2016 14:38:01 +0000 (15:38 +0100)]
utils_subst_test.c: constify

8 years agoceph_test.c: constify
Ruben Kerkhof [Sat, 12 Mar 2016 13:38:41 +0000 (14:38 +0100)]
ceph_test.c: constify

8 years agobattery plugin: constify
Ruben Kerkhof [Fri, 11 Mar 2016 18:50:04 +0000 (19:50 +0100)]
battery plugin: constify

8 years agoFix some typos in the collectd.conf manpage
Ruben Kerkhof [Fri, 11 Mar 2016 16:54:11 +0000 (17:54 +0100)]
Fix some typos in the collectd.conf manpage

8 years agoFix some typos in collectd.conf
Ruben Kerkhof [Fri, 11 Mar 2016 16:12:34 +0000 (17:12 +0100)]
Fix some typos in collectd.conf

8 years agoRevert "Fix building with older versions of libtool"
Ruben Kerkhof [Wed, 9 Mar 2016 22:44:42 +0000 (23:44 +0100)]
Revert "Fix building with older versions of libtool"

While this fixed building from git on EL5, it broke
building from tarballs. Since the latter is more important,
revert this until I can get to the bottom of it.

This reverts commit 5a911ceb65165a4293830503afd257a9bd474bc7.

8 years agoRevert "Turbostat: add missing types in configure.ac"
Ruben Kerkhof [Sun, 6 Mar 2016 17:08:38 +0000 (18:08 +0100)]
Revert "Turbostat: add missing types in configure.ac"

These autoconf tests were introduced in autoconf 2.60.
We still support older versions.

We've assumed for a while now that any platform we build
on has the types and functionality tested here available, and supports
a reasonable subset of the C99 and Posix standards.

This fixes building from git on RHEL5.

This reverts commit 45687863426b21f854711248258a13c345371843.

8 years agoFix building with older versions of libtool
Ruben Kerkhof [Sun, 6 Mar 2016 17:06:38 +0000 (18:06 +0100)]
Fix building with older versions of libtool

The libtool on RHEL5 doesn't set LTDEPS, therefore
we failed to compile the builtin ltdl lib.

It does however set LIBLTDL to the path of the if it is
going to build an internal one. Use that.

Fixes building from git on RHEL5

8 years agobuild.sh: explicitly check for bison
Ruben Kerkhof [Sun, 6 Mar 2016 17:02:35 +0000 (18:02 +0100)]
build.sh: explicitly check for bison

We don't work with other yaccs.

8 years agopython plugin: fix some typos in doc strings
Ruben Kerkhof [Sun, 6 Mar 2016 13:11:11 +0000 (14:11 +0100)]
python plugin: fix some typos in doc strings

8 years agocurl_json plugin: zero-initialize struct correctly
Ruben Kerkhof [Sun, 6 Mar 2016 12:44:59 +0000 (13:44 +0100)]
curl_json plugin: zero-initialize struct correctly

Seen on FreeBSD:
curl_json.c: In function 'cj_sock_perform':
curl_json.c:864:10: warning: missing initializer for field 'sun_len' of 'struct sockaddr_un' [-Wmissing-field-initializers]
   struct sockaddr_un sa_unix = {};
          ^
In file included from curl_json.c:32:0:
/usr/include/sys/un.h:48:16: note: 'sun_len' declared here
  unsigned char sun_len; /* sockaddr len including null */
                ^

8 years agovirt plugin: missed one old-style definition
Ruben Kerkhof [Sun, 6 Mar 2016 12:30:10 +0000 (13:30 +0100)]
virt plugin: missed one old-style definition

8 years agoTravis: build python plugin
Ruben Kerkhof [Sun, 6 Mar 2016 11:46:15 +0000 (12:46 +0100)]
Travis: build python plugin

The Travis image has various python versions installed in /opt,
none of which have development headers, and they are first in
the PATH. Explicitly use the python in /usr/bin instead.

8 years agoTravis: build iptables plugin
Ruben Kerkhof [Sun, 6 Mar 2016 11:45:47 +0000 (12:45 +0100)]
Travis: build iptables plugin

8 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Sun, 6 Mar 2016 11:09:29 +0000 (12:09 +0100)]
Merge branch 'collectd-5.5'

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sun, 6 Mar 2016 11:08:59 +0000 (12:08 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

8 years agovirt plugin: fix old-style function definitions
Ruben Kerkhof [Sun, 6 Mar 2016 11:00:24 +0000 (12:00 +0100)]
virt plugin: fix old-style function definitions

8 years agoMerge pull request #1575 from rubenk/dragonflybsd-utils-mount
Ruben Kerkhof [Sun, 6 Mar 2016 10:49:07 +0000 (11:49 +0100)]
Merge pull request #1575 from rubenk/dragonflybsd-utils-mount

Fix build on DragonFlyBSD

8 years agoMerge pull request #1580 from rubenk/freebsd-zfs-arc
Ruben Kerkhof [Sun, 6 Mar 2016 10:20:42 +0000 (11:20 +0100)]
Merge pull request #1580 from rubenk/freebsd-zfs-arc

zfs_arc: 'stolen' was removed after FreeBSD 10.2