Code

Merge branch 'collectd-5.4'
authorFlorian Forster <octo@collectd.org>
Mon, 18 Aug 2014 07:50:34 +0000 (09:50 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 18 Aug 2014 07:50:34 +0000 (09:50 +0200)
commit103f05e098865196fc5f28df51e99b64fd6b5202
tree419bc601ee9cdde5c2c7b91747c06afc1f6ca8f0
parentd4547a2861caad836701e70f805f7be68a91272e
parentfd7673e5e9ad074624fc23cda5d2ec4549d43659
Merge branch 'collectd-5.4'

Conflicts:
configure.ac
src/curl_json.c
src/lvm.c
src/write_riemann.c
24 files changed:
ChangeLog
configure.ac
contrib/redhat/collectd.spec
src/Makefile.am
src/amqp.c
src/apache.c
src/collectd-unixsock.pod
src/collectd.conf.in
src/collectd.conf.pod
src/common.c
src/configfile.c
src/curl.c
src/curl_json.c
src/curl_xml.c
src/exec.c
src/lvm.c
src/network.c
src/processes.c
src/snmp.c
src/tcpconns.c
src/utils_vl_lookup.c
src/write_http.c
src/write_riemann.c
version-gen.sh