From: Florian Forster <octo@collectd.org>
Date: Thu, 18 Jun 2015 14:52:09 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0003c4d3c184f0f437499d6073cd023dc7b659c2;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

0003c4d3c184f0f437499d6073cd023dc7b659c2
diff --cc src/Makefile.am
index 9839c03a3,62f98751f..c718621e9
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -953,8 -1094,10 +953,8 @@@ if BUILD_PLUGIN_STATS
  pkglib_LTLIBRARIES += statsd.la
  statsd_la_SOURCES = statsd.c \
                      utils_latency.h utils_latency.c
 -statsd_la_LDFLAGS = -module -avoid-version
 +statsd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
- statsd_la_LIBADD = -lpthread
+ statsd_la_LIBADD = -lpthread -lm
 -collectd_LDADD += "-dlopen" statsd.la
 -collectd_DEPENDENCIES += statsd.la
  endif
  
  if BUILD_PLUGIN_SWAP
diff --cc src/threshold.c
index 882f95535,4a840bb9c..a8900db76
--- a/src/threshold.c
+++ b/src/threshold.c
@@@ -516,11 -626,7 +516,9 @@@ static int ut_report_state (const data_
            ": Value is no longer missing.");
      else
        status = ssnprintf (buf, bufsize,
 -          ": All data sources are within range again.");
 +          ": All data sources are within range again. "
 +          "Current value of \"%s\" is %f.",
 +          ds->ds[ds_index].name, values[ds_index]);
-     buf += status;
-     bufsize -= status;
    }
    else
    {