Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Sat, 9 May 2015 22:13:19 +0000 (00:13 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sat, 9 May 2015 22:13:19 +0000 (00:13 +0200)
commit9708614487ec93df67ad1095f3cf5a0987b9cc28
tree2cdc1d336fdfb28c4d531ccaf26ff75b21709cfa
parent02c45fc2ecb087fb140e90217e5b701959306c1a
parenta2c0ff89b4792142dff02ee46bc5a578a5e6063e
Merge branch 'collectd-5.3' into collectd-5.4
configure.ac
contrib/redhat/collectd.spec
src/amqp.c
src/processes.c
version-gen.sh