Code

Merge branch 'collectd-5.7'
authorFlorian Forster <octo@collectd.org>
Thu, 22 Dec 2016 09:57:57 +0000 (10:57 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 22 Dec 2016 09:57:57 +0000 (10:57 +0100)
1  2 
src/daemon/common.c
src/daemon/configfile.c
src/netapp.c

Simple merge
Simple merge
diff --cc src/netapp.c
Simple merge