author | Marc Fournier <marc.fournier@camptocamp.com> | |
Wed, 26 Aug 2015 21:40:18 +0000 (23:40 +0200) | ||
committer | Marc Fournier <marc.fournier@camptocamp.com> | |
Wed, 26 Aug 2015 21:40:18 +0000 (23:40 +0200) | ||
commit | eab8493d114c7c209d90ac54edb7c8026c085747 | |
tree | 8c640ea85a8d9bf8042d5d05aac41da02a034256 | tree | snapshot |
parent | 9ad5eefaa9dcc557c9117f8692cec1792f7ac7f0 | commit | diff |
parent | 9ab0a540f2b0f2b0427c33e198ca06d60d959182 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
configure.ac | diff1 | | diff2 | | blob | history |
src/dns.c | diff1 | | diff2 | | blob | history |
src/exec.c | diff1 | | diff2 | | blob | history |
src/liboconfig/scanner.l | diff1 | | diff2 | | blob | history |
src/pf.c | diff1 | | diff2 | | blob | history |
src/utils_vl_lookup.c | diff1 | | diff2 | | blob | history |