![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Thu, 12 Mar 2015 09:07:27 +0000 (10:07 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Thu, 12 Mar 2015 09:07:27 +0000 (10:07 +0100) | ||
| commit | 9817e7298bd6c364fa17347327af54adf048bd21 | |
| tree | b4a7f3885683505de999ca8e364b641ee6363830 | tree | snapshot |
| parent | 141fd848ae803a4be14d176283b98e539ed1efb7 | commit | diff |
| parent | 0ea3dd8c7e3df6a0cac20be4c70f3f6a7433a041 | commit | diff |
Merge branch 'collectd-5.4'
Conflicts:
configure.ac
src/dbi.c
src/utils_latency.c
Conflicts:
configure.ac
src/dbi.c
src/utils_latency.c
| ChangeLog | diff1 | | diff2 | | blob | history |
| configure.ac | diff1 | | diff2 | | blob | history |
| src/collectd-exec.pod | diff1 | | diff2 | | blob | history |
| src/daemon/plugin.c | diff1 | | | | blob | history |
| src/dbi.c | diff1 | | diff2 | | blob | history |
| src/exec.c | diff1 | | diff2 | | blob | history |
| src/utils_latency.c | diff1 | | diff2 | | blob | history |
| version-gen.sh | diff1 | | diff2 | | blob | history |