![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Mon, 24 Nov 2014 08:44:45 +0000 (09:44 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Mon, 24 Nov 2014 08:44:45 +0000 (09:44 +0100) | ||
| commit | e1812f8e5c5f91328398c66b602d07ee7c6ede51 | |
| tree | b7ea92d13ddf4af08ac89b2c09cecea7f1d761cf | tree | snapshot |
| parent | e4df561e0843e4fc93a57609955fea00618da6ec | commit | diff |
| parent | 61bda3c7438f57086b0fcf87cc54407efcbaf9e3 | commit | diff |
Merge branch 'collectd-5.4'
Conflicts:
src/Makefile.am
src/cpu.c
src/swap.c
src/write_redis.c
NB: dropped change to src/swap.c made in 1a146775d4, as suggested in the
commit message.
Conflicts:
src/Makefile.am
src/cpu.c
src/swap.c
src/write_redis.c
NB: dropped change to src/swap.c made in 1a146775d4, as suggested in the
commit message.
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/cpu.c | diff1 | | diff2 | | blob | history |
| src/curl_json.c | diff1 | | diff2 | | blob | history |
| src/daemon/common.c | diff1 | | | | blob | history |
| src/daemon/filter_chain.c | diff1 | | | | blob | history |
| src/daemon/plugin.c | diff1 | | | | blob | history |
| src/write_graphite.c | diff1 | | diff2 | | blob | history |