Merge branch 'collectd-5.4'
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 12 Mar 2015 09:07:27 +0000 (10:07 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 12 Mar 2015 09:07:27 +0000 (10:07 +0100)
commit9817e7298bd6c364fa17347327af54adf048bd21
treeb4a7f3885683505de999ca8e364b641ee6363830
parent141fd848ae803a4be14d176283b98e539ed1efb7
parent0ea3dd8c7e3df6a0cac20be4c70f3f6a7433a041
Merge branch 'collectd-5.4'

Conflicts:
configure.ac
src/dbi.c
src/utils_latency.c
ChangeLog
configure.ac
src/collectd-exec.pod
src/daemon/plugin.c
src/dbi.c
src/exec.c
src/utils_latency.c
version-gen.sh