From: Sven Trenkel <collectd@semidefinite.de>
Date: Mon, 28 Sep 2009 11:57:46 +0000 (+0200)
Subject: Merge commit 'octo/st/netapp' into st/netapp
X-Git-Tag: collectd-4.9.0~73^2~23^2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=0742dc6da5074abaf3bb27c579de12460f7db690

Merge commit 'octo/st/netapp' into st/netapp
---

0742dc6da5074abaf3bb27c579de12460f7db690
diff --cc src/netapp.c
index 446f8bf6,613fa656..e247e831
--- a/src/netapp.c
+++ b/src/netapp.c
@@@ -1523,12 -1689,7 +1704,9 @@@ static int cna_init(void) { /* {{{ *
  			} else if (service->handler == query_volume_perf_data) {
  				service->query = na_elem_new("perf-object-get-instances");
  				na_child_add_string(service->query, "objectname", "volume");
- /*				e = na_elem_new("instances");
- 				na_child_add_string(e, "foo", "system");
- 				na_child_add(root, e);*/
  				e = na_elem_new("counters");
 +				/* "foo" means: This string has to be here but
 +				   the content doesn't matter. */
  				na_child_add_string(e, "foo", "read_ops");
  				na_child_add_string(e, "foo", "write_ops");
  				na_child_add_string(e, "foo", "read_data");