Code

Merge remote-tracking branch 'github/pr/1749'
authorFlorian Forster <octo@collectd.org>
Fri, 14 Oct 2016 20:51:04 +0000 (22:51 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 14 Oct 2016 20:51:04 +0000 (22:51 +0200)
1  2 
src/Makefile.am
src/daemon/common.c
src/daemon/plugin.h
src/exec.c
src/utils_vl_lookup_test.c

diff --cc src/Makefile.am
Simple merge
Simple merge
Simple merge
diff --cc src/exec.c
Simple merge
Simple merge