From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 25 Nov 2010 10:51:17 +0000 (+0100)
Subject: Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
X-Git-Tag: collectd-4.9.4~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=613f5b8a4a3ec711b29928ba78ab7d318ff169fc;hp=0a6626747f40f7a39947033e8e64242e731cd7e1;p=collectd.git

Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
---

diff --git a/src/netapp.c b/src/netapp.c
index 1615c497..87f6cbd9 100644
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -1590,6 +1590,9 @@ static int cna_handle_volume_usage_data (const host_config_t *host, /* {{{ */
 		if (sis == NULL)
 			continue;
 
+		if (na_elem_child(sis, "sis-info"))
+			sis = na_elem_child(sis, "sis-info");
+		
 		sis_state = na_child_get_string(sis, "state");
 		if (sis_state == NULL)
 			continue;