![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Sat, 6 Sep 2014 09:30:20 +0000 (11:30 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Sat, 6 Sep 2014 09:30:20 +0000 (11:30 +0200) | ||
| commit | 061c3c091d725d58dfe1e7525a8d72a1ea389a8a | |
| tree | d3fc939b715e72b208785c5ee47736f941919883 | tree | snapshot |
| parent | 678fa2e92311ff80c64d2a8e536f6c4126614660 | commit | diff |
| parent | 21077b074c468a41dbd60baad691ebc7f2991d43 | commit | diff |
Merge branch 'collectd-5.4'
13 files changed:
| bindings/java/org/collectd/java/GenericJMXConfConnection.java | diff1 | | diff2 | | blob | history |
| contrib/redhat/collectd.spec | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/curl.c | diff1 | | diff2 | | blob | history |
| src/java.c | diff1 | | diff2 | | blob | history |
| src/memcachec.c | diff1 | | diff2 | | blob | history |
| src/meta_data.c | diff1 | | diff2 | | blob | history |
| src/network.c | diff1 | | diff2 | | blob | history |
| src/utils_format_json.c | diff1 | | diff2 | | blob | history |
| src/utils_match.c | diff1 | | diff2 | | blob | history |
| src/utils_match.h | diff1 | | diff2 | | blob | history |
| src/utils_rrdcreate.c | diff1 | | diff2 | | blob | history |