From: Florian Forster Date: Mon, 13 Feb 2012 21:10:52 +0000 (+0100) Subject: Merge branch 'ss/graphite' X-Git-Tag: collectd-5.1.0~35 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=c149ae31b04a082f7915f39e8d51ddec4a0595f8;p=collectd.git Merge branch 'ss/graphite' --- c149ae31b04a082f7915f39e8d51ddec4a0595f8 diff --cc src/collectd.conf.in index 9ae18cd6,21badd43..0c21ee23 --- a/src/collectd.conf.in +++ b/src/collectd.conf.in @@@ -144,9 -144,10 +144,10 @@@ #@BUILD_PLUGIN_VMEM_TRUE@LoadPlugin vmem #@BUILD_PLUGIN_VSERVER_TRUE@LoadPlugin vserver #@BUILD_PLUGIN_WIRELESS_TRUE@LoadPlugin wireless + #@BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@LoadPlugin write_graphite #@BUILD_PLUGIN_WRITE_HTTP_TRUE@LoadPlugin write_http #@BUILD_PLUGIN_WRITE_REDIS_TRUE@LoadPlugin write_redis -#@BUILD_PLUGIN_WRITE_MONGO_TRUE@LoadPlugin write_mongo +#@BUILD_PLUGIN_WRITE_MONGODB_TRUE@LoadPlugin write_mongodb #@BUILD_PLUGIN_XMMS_TRUE@LoadPlugin xmms #@BUILD_PLUGIN_ZFS_ARC_TRUE@LoadPlugin zfs_arc