Code

Merge branch 'collectd-5.4'
authorFlorian Forster <octo@collectd.org>
Sat, 6 Sep 2014 09:30:20 +0000 (11:30 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 6 Sep 2014 09:30:20 +0000 (11:30 +0200)
commit061c3c091d725d58dfe1e7525a8d72a1ea389a8a
treed3fc939b715e72b208785c5ee47736f941919883
parent678fa2e92311ff80c64d2a8e536f6c4126614660
parent21077b074c468a41dbd60baad691ebc7f2991d43
Merge branch 'collectd-5.4'
13 files changed:
bindings/java/org/collectd/java/GenericJMXConfConnection.java
contrib/redhat/collectd.spec
src/collectd.conf.in
src/collectd.conf.pod
src/curl.c
src/java.c
src/memcachec.c
src/meta_data.c
src/network.c
src/utils_format_json.c
src/utils_match.c
src/utils_match.h
src/utils_rrdcreate.c