From 955af7c84d853cdba98534f1f88d3acf311de450 Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@collectd.org>
Date: Thu, 17 Jan 2013 09:46:20 +0100
Subject: [PATCH] src/collectd.conf.in: Rename "riemann" to "write_riemann".

---
 src/collectd.conf.in | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index c4969b40..d55dc463 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -125,7 +125,6 @@
 #@BUILD_PLUGIN_PYTHON_TRUE@  Globals true
 #@BUILD_PLUGIN_PYTHON_TRUE@</LoadPlugin>
 #@BUILD_PLUGIN_REDIS_TRUE@LoadPlugin redis
-#@BUILD_PLUGIN_RIEMANN_TRUE@LoadPlugin riemann
 #@BUILD_PLUGIN_ROUTEROS_TRUE@LoadPlugin routeros
 #@BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached
 @LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
@@ -151,8 +150,9 @@
 #@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_MONGODB_TRUE@LoadPlugin write_mongodb
+#@BUILD_PLUGIN_WRITE_REDIS_TRUE@LoadPlugin write_redis
+#@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@LoadPlugin write_riemann
 #@BUILD_PLUGIN_XMMS_TRUE@LoadPlugin xmms
 #@BUILD_PLUGIN_ZFS_ARC_TRUE@LoadPlugin zfs_arc
 
@@ -813,13 +813,6 @@
 #   </Node>
 #</Plugin>
 
-#<Plugin riemann>
-#   <Host "localhost">
-#      Port 5555
-#      Delay 2
-#   </Host>
-#</Plugin>
-
 #<Plugin routeros>
 #	<Router>
 #		Host "router.example.com"
@@ -1029,23 +1022,30 @@
 #	</URL>
 #</Plugin>
 
-#<Plugin write_redis>
+#<Plugin write_mongodb>
 #	<Node "example">
 #		Host "localhost"
-#		Port "6379"
+#		Port "27017"
 #		Timeout 1000
+#		StoreRates false
 #	</Node>
 #</Plugin>
 
-#<Plugin write_mongodb>
+#<Plugin write_redis>
 #	<Node "example">
 #		Host "localhost"
-#		Port "27017"
+#		Port "6379"
 #		Timeout 1000
-#		StoreRates false
 #	</Node>
 #</Plugin>
 
+#<Plugin write_riemann>
+#   <Host "localhost">
+#      Port 5555
+#      Delay 2
+#   </Host>
+#</Plugin>
+
 ##############################################################################
 # Filter configuration                                                       #
 #----------------------------------------------------------------------------#
-- 
2.11.0