![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Tue, 14 Jul 2015 06:19:38 +0000 (08:19 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Tue, 14 Jul 2015 06:19:38 +0000 (08:19 +0200) |
| 1 | 2 | |||
|---|---|---|---|---|
| src/Makefile.am | patch | | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | patch | | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/Makefile.am
Simple merge
diff --cc src/collectd.conf.in
index 8cf6ca91e8406e0d6d3a09ab23d6f5b73db69c84,7877228e44e35f916bacf2941122bb7c8b14b23d..1f4ccf8175a99d44cecfa325429ddb586631e0dc
+++ b/src/collectd.conf.in
#@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
diff --cc src/collectd.conf.pod
Simple merge