![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Mon, 24 Nov 2014 08:23:18 +0000 (09:23 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Mon, 24 Nov 2014 08:23:18 +0000 (09:23 +0100) | ||
| commit | 61bda3c7438f57086b0fcf87cc54407efcbaf9e3 | |
| tree | ab3e74aa5fed690ddd2d1511bdb5c30732c896f0 | tree | snapshot |
| parent | 232898b5a6ee58d432a63d932a0ff447a606241d | commit | diff |
| parent | 51a4e62d7d0e73d8d5822efaef1e3218b5ad0373 | commit | diff |
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
src/write_graphite.c
Conflicts:
src/write_graphite.c
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/plugin.c | diff1 | | diff2 | | blob | history |
| src/write_graphite.c | diff1 | | diff2 | | blob | history |