Merge branch 'collectd-4.10'

diff --git a/ChangeLog b/ChangeLog
index 322ae16..2903476 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@
        * python plugin: Set "sys.argv", since many scripts don't expect that
          it may not be set. Thanks to Sven Trenkel for the patch.
        * rrdtool, rrdcached plugin: Fix a too strict assertion when creating
+         RRD files.
        * swap plugin: A bug which lead to incorrect I/O values has been
          fixed.
        * value match: A minor memory leak has been fixed. Thanks to Sven

diff --git a/configure.in b/configure.in
index 8ec8415..c2ddaf0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3581,7 +3581,7 @@ AM_CONDITIONAL(BUILD_WITH_LIBTOKYOTYRANT, test "x$with_libtokyotyrant" = "xyes")
 with_libupsclient_config=""
 with_libupsclient_cflags=""
 with_libupsclient_libs=""
-AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], [Path to the Net-SNMPD library.])],
+AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], [Path to the upsclient library.])],
 [
        if test "x$withval" = "xno"
        then

diff --git a/src/common.c b/src/common.c
index 1c80e8f..7813d5b 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -963,11 +963,11 @@ int parse_value (const char *value, value_t *ret_value, int ds_type)
       break;
 
     case DS_TYPE_DERIVE:
-      ret_value->counter = (derive_t) strtoll (value, &endptr, 0);
+      ret_value->derive = (derive_t) strtoll (value, &endptr, 0);
       break;
 
     case DS_TYPE_ABSOLUTE:
-      ret_value->counter = (absolute_t) strtoull (value, &endptr, 0);
+      ret_value->absolute = (absolute_t) strtoull (value, &endptr, 0);
       break;
 
     default: