From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 18 Feb 2008 19:53:32 +0000 (+0100)
Subject: Merge branch 'sh/hddtemp'
X-Git-Tag: collectd-4.3.0~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f99cbc5ea9873ce331c27fa698396fdc0cd02d68;p=collectd.git

Merge branch 'sh/hddtemp'
---

f99cbc5ea9873ce331c27fa698396fdc0cd02d68
diff --cc src/collectd.conf.in
index a1172a18,2554d60a..e125bb63
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -102,13 -100,13 +102,14 @@@ FQDNLookup   tru
  
  #<Plugin exec>
  #	Exec "user:group" "/path/to/exec"
 +#	NotificationExec "/path/to/exec"
  #</Plugin>
  
- #<Plugin hddtemp>
+ @BUILD_PLUGIN_HDDTEMP_TRUE@<Plugin hddtemp>
  #	Host "127.0.0.1"
  #	Port "7634"
- #</Plugin>
+ @BUILD_PLUGIN_HDDTEMP_TRUE@	TranslateDevicename false
+ @BUILD_PLUGIN_HDDTEMP_TRUE@</Plugin>
  
  #<Plugin interface>
  #	Interface "eth0"