Merge branch 'ym/target_set_add_meta' of github.com:ymettier/collectd into target_set...
authorKevin Bowling <kbowling@llnw.com>
Wed, 6 Apr 2016 06:20:48 +0000 (23:20 -0700)
committerKevin Bowling <kbowling@llnw.com>
Wed, 6 Apr 2016 06:20:48 +0000 (23:20 -0700)
commite030096e4f5a0bbdd42635bfeb95e39d150cac72
tree79ba79157f899560344a079ba79e45eac61e60fb
parentc10c83d52a0d0af46b6f08e101fc4c2e12e52119
parenta89fc9296186de14cc308e18adae56c7777bae0e
Merge branch 'ym/target_set_add_meta' of github.com:ymettier/collectd into target_set_add_meta
src/collectd.conf.pod
src/daemon/meta_data.c
src/target_set.c