Merge remote-tracking branch 'tokkee/sh/collectd-5.0' into collectd-5.0

diff --git a/README b/README
index 811c594cae9bd4748b1fbc0cd3b94e6be7bec805..6badeecd5b4b837c9c19115923d2521780d14f96 100644 (file)
--- a/README
+++ b/README
@@ -363,6 +363,9 @@ Features
       requests. The transmitted data is either in a form understood by the
       Exec plugin or formatted in JSON.
 
+    - write_redis
+      Sends the values to a Redis key-value database server.
+
   * Logging is, as everything in collectd, provided by plugins. The following
     plugins keep up informed about what's going on:
 

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index f514f4a7805f0384d8d79df6c2718fcc5e79e4c6..cd65fd27af9936bb3ba3636dabe9989c8599a76e 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -988,6 +988,7 @@
 #@BUILD_PLUGIN_TARGET_REPLACE_TRUE@LoadPlugin target_replace
 #@BUILD_PLUGIN_TARGET_SCALE_TRUE@LoadPlugin target_scale
 #@BUILD_PLUGIN_TARGET_SET_TRUE@LoadPlugin target_set
+#@BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@LoadPlugin target_v5upgrade
 
 #----------------------------------------------------------------------------#
 # The following block demonstrates the default behavior if no filtering is   #