From: Florian Forster <octo@collectd.org>
Date: Fri, 19 Jun 2015 13:11:39 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81a5fd5046c6a39f580a8fc1a3af837fd5f5aa5c;p=thirdparty%2Fcollectd.git

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

81a5fd5046c6a39f580a8fc1a3af837fd5f5aa5c
diff --cc src/threshold.c
index a8900db76,391ee932a..8dcb711d5
--- a/src/threshold.c
+++ b/src/threshold.c
@@@ -512,13 -622,9 +512,12 @@@ static int ut_report_state (const data_
    if (state == STATE_OKAY)
    {
      if (state_old == STATE_MISSING)
-       status = ssnprintf (buf, bufsize,
-           ": Value is no longer missing.");
+       ssnprintf (buf, bufsize, ": Value is no longer missing.");
      else
-       status = ssnprintf (buf, bufsize,
 -      ssnprintf (buf, bufsize, ": All data sources are within range again.");
++      ssnprintf (buf, bufsize,
 +          ": All data sources are within range again. "
 +          "Current value of \"%s\" is %f.",
 +          ds->ds[ds_index].name, values[ds_index]);
    }
    else
    {