]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
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)
1  2 
src/daemon/common.c
src/daemon/utils_cache.c
src/utils_db_query.c

Simple merge
Simple merge
Simple merge