Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 15:29:38 +0000 (17:29 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 15:29:38 +0000 (17:29 +0200)
commitd6491cfcf52a74498e1becd7ef94fc8e0a5938b9
tree2c5001f4c666cfc0c143157c12fab14c54549f44
parent8bf78cdeec00dde7769be38224cad3e835f7c59a
parentefda0ff7c7035dbbe72014369d1ad8c9624e8616
Merge branch 'collectd-5.4' into collectd-5.5
src/daemon/common.c
src/daemon/utils_cache.c
src/utils_db_query.c