Merge branch 'collectd-5.4'
authorMarc Fournier <marc.fournier@camptocamp.com>
Sat, 9 May 2015 22:14:18 +0000 (00:14 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sat, 9 May 2015 22:14:18 +0000 (00:14 +0200)
commitb57d6e25aa792f0461aee4e5bd6d1838c478af50
treea10925e7f2ba74b93f55664ce92783dea65984d9
parentfed6710c8e31db8fd84219be418b62713cd2b331
parent9708614487ec93df67ad1095f3cf5a0987b9cc28
Merge branch 'collectd-5.4'
configure.ac
contrib/redhat/collectd.spec
src/daemon/meta_data.c
src/processes.c
src/swap.c