![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Tue, 29 Jul 2014 14:25:31 +0000 (16:25 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Tue, 29 Jul 2014 14:25:31 +0000 (16:25 +0200) | ||
| commit | 8f4a48a804f9d95010cf5ad469e4729cebc3e0e9 | |
| tree | c97091f88a28791538c370be955726971374cd9c | tree | snapshot |
| parent | cadc1d5581d3024f4c5ebb940cd49a0dec45c9d4 | commit | diff |
| parent | 01f04ae581be93c6434a858bfaabc5e42237a6fe | commit | diff |
Merge remote-tracking branch 'github/pr/682'
16 files changed:
| bindings/java/org/collectd/api/Collectd.java | diff1 | | diff2 | | blob | history |
| bindings/java/org/collectd/java/GenericJMXConfConnection.java | diff1 | | diff2 | | blob | history |
| src/collectd-exec.pod | diff1 | | diff2 | | blob | history |
| src/collectd-unixsock.pod | diff1 | | diff2 | | blob | history |
| src/collectd.c | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/collectd.h | diff1 | | diff2 | | blob | history |
| src/configfile.c | diff1 | | diff2 | | blob | history |
| src/conntrack.c | diff1 | | diff2 | | blob | history |
| src/cpu.c | diff1 | | diff2 | | blob | history |
| src/java.c | diff1 | | diff2 | | blob | history |
| src/onewire.c | diff1 | | diff2 | | blob | history |
| src/utils_cmd_putnotif.c | diff1 | | diff2 | | blob | history |
| src/utils_db_query.c | diff1 | | diff2 | | blob | history |
| src/utils_latency.c | diff1 | | diff2 | | blob | history |
| src/utils_parse_option.c | diff1 | | diff2 | | blob | history |