Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Fri, 22 May 2015 09:33:27 +0000 (11:33 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 22 May 2015 09:33:27 +0000 (11:33 +0200)
commit0beb06563c5681975fd4f743c547e15f4facb29f
tree3ab5d7fe8e81a7eee3ee17d2621e27ad781721e1
parent47e8dc00c85a8ffaf051d922112270910b8665b8
parent35dfbf6616169e6f0fddb2edd0ccb53b6a753da7
Merge branch 'collectd-5.4' into collectd-5.5

Conflicts:
src/write_redis.c
src/daemon/collectd.h
src/daemon/common.c
src/postgresql.c
src/target_notification.c
src/utils_format_graphite.c
src/utils_format_json.c
src/utils_format_json.h
src/write_redis.c