From: Marc Fournier Date: Tue, 19 May 2015 16:37:19 +0000 (+0200) Subject: Merge branch 'collectd-4.10' into collectd-5.3 X-Git-Tag: collectd-5.5.0~12^2~4^2 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=967685afeaff2cb4f7e4f733f17df95363727c4f;p=collectd.git Merge branch 'collectd-4.10' into collectd-5.3 --- 967685afeaff2cb4f7e4f733f17df95363727c4f diff --cc src/curl_xml.c index 7ca9831f,e96bba31..e3d37f48 --- a/src/curl_xml.c +++ b/src/curl_xml.c @@@ -383,9 -343,9 +384,9 @@@ static int cx_handle_instance_xpath (xm memset (vl->type_instance, 0, sizeof (vl->type_instance)); /* If the base xpath returns more than one block, the result is assumed to be - * a table. The `Instnce' option is not optional in this case. Check for the + * a table. The `Instance' option is not optional in this case. Check for the * condition and inform the user. */ - if (is_table) + if (is_table && (xpath->instance == NULL)) { WARNING ("curl_xml plugin: " "Base-XPath %s is a table (more than one result was returned), "