From: Florian Forster Date: Tue, 14 Jul 2015 06:19:38 +0000 (+0200) Subject: Merge remote-tracking branch 'github/pr/1124' X-Git-Tag: collectd-5.6.0~637 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e739c81228d4b68531f6a64974192b1e1b0adf47;p=collectd.git Merge remote-tracking branch 'github/pr/1124' --- e739c81228d4b68531f6a64974192b1e1b0adf47 diff --cc src/collectd.conf.in index 8cf6ca91,7877228e..1f4ccf81 --- a/src/collectd.conf.in +++ b/src/collectd.conf.in @@@ -138,8 -138,8 +138,9 @@@ #@BUILD_PLUGIN_MEMCACHEC_TRUE@LoadPlugin memcachec #@BUILD_PLUGIN_MEMCACHED_TRUE@LoadPlugin memcached @BUILD_PLUGIN_MEMORY_TRUE@@BUILD_PLUGIN_MEMORY_TRUE@LoadPlugin memory +#@BUILD_PLUGIN_MIC_TRUE@LoadPlugin mic #@BUILD_PLUGIN_MODBUS_TRUE@LoadPlugin modbus + #@BUILD_PLUGIN_MQTT_TRUE@LoadPlugin mqtt #@BUILD_PLUGIN_MULTIMETER_TRUE@LoadPlugin multimeter #@BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql #@BUILD_PLUGIN_NETAPP_TRUE@LoadPlugin netapp