Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Tue, 8 Dec 2015 13:42:07 +0000 (14:42 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 8 Dec 2015 13:42:07 +0000 (14:42 +0100)
commit42a7c90f4478e98dc970927cfda7ec2e1081f364
treec5d93e7bbed412aed41a18d1fc13217706c4f293
parent03f81fa2ddcd60a4bdc7ce78775554da2166fc70
parentd89829d22853ee0b7678b6e2ee7fdd359f3b7202
Merge branch 'collectd-5.5'
src/collectd-tg.c
src/email.c
src/ping.c
src/postgresql.c
src/python.c
src/rrdtool.c
src/tail.c
src/utils_format_json.c