Code

Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 26 Aug 2015 21:40:18 +0000 (23:40 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 26 Aug 2015 21:40:18 +0000 (23:40 +0200)
1  2 
configure.ac
src/dns.c
src/exec.c
src/liboconfig/scanner.l
src/pf.c
src/utils_vl_lookup.c

diff --cc configure.ac
Simple merge
diff --cc src/dns.c
Simple merge
diff --cc src/exec.c
index 8d737cea0354e2490bd801c350fdac63a7dbf650,0445b14a91f879bdfccb2cd44024586741ce5888..f080ad674bac793ceb27feb0f75de67d16385fb4
mode 100644,100755..100755
Simple merge
diff --cc src/pf.c
Simple merge
Simple merge