Merge remote-tracking branch 'github/pr/682'
authorFlorian Forster <octo@collectd.org>
Tue, 29 Jul 2014 14:25:31 +0000 (16:25 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 29 Jul 2014 14:25:31 +0000 (16:25 +0200)
commit8f4a48a804f9d95010cf5ad469e4729cebc3e0e9
treec97091f88a28791538c370be955726971374cd9c
parentcadc1d5581d3024f4c5ebb940cd49a0dec45c9d4
parent01f04ae581be93c6434a858bfaabc5e42237a6fe
Merge remote-tracking branch 'github/pr/682'
16 files changed:
bindings/java/org/collectd/api/Collectd.java
bindings/java/org/collectd/java/GenericJMXConfConnection.java
src/collectd-exec.pod
src/collectd-unixsock.pod
src/collectd.c
src/collectd.conf.pod
src/collectd.h
src/configfile.c
src/conntrack.c
src/cpu.c
src/java.c
src/onewire.c
src/utils_cmd_putnotif.c
src/utils_db_query.c
src/utils_latency.c
src/utils_parse_option.c