![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Fri, 22 May 2015 09:33:27 +0000 (11:33 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Fri, 22 May 2015 09:33:27 +0000 (11:33 +0200) | ||
| commit | 0beb06563c5681975fd4f743c547e15f4facb29f | |
| tree | 3ab5d7fe8e81a7eee3ee17d2621e27ad781721e1 | tree | snapshot |
| parent | 47e8dc00c85a8ffaf051d922112270910b8665b8 | commit | diff |
| parent | 35dfbf6616169e6f0fddb2edd0ccb53b6a753da7 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
Conflicts:
src/write_redis.c
Conflicts:
src/write_redis.c
| src/daemon/collectd.h | diff1 | | | | blob | history |
| src/daemon/common.c | diff1 | | | | blob | history |
| src/postgresql.c | diff1 | | diff2 | | blob | history |
| src/target_notification.c | diff1 | | diff2 | | blob | history |
| src/utils_format_graphite.c | diff1 | | diff2 | | blob | history |
| src/utils_format_json.c | diff1 | | diff2 | | blob | history |
| src/utils_format_json.h | diff1 | | diff2 | | blob | history |
| src/write_redis.c | diff1 | | diff2 | | blob | history |