From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 10 Oct 2016 19:04:03 +0000 (+0200)
Subject: Merge branch 'collectd-5.6'
X-Git-Tag: collectd-5.7.0~54
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=8c5927c52f4eefebaad3a6ecadc253ee9007ebb5

Merge branch 'collectd-5.6'
---

8c5927c52f4eefebaad3a6ecadc253ee9007ebb5
diff --cc contrib/redhat/collectd.spec
index f66cb4a1,4c136d65..eaf6f31a
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -231,8 -226,8 +231,8 @@@
  
  Summary:	Statistics collection and monitoring daemon
  Name:		collectd
 -Version:	5.6.1
 +Version:	5.7.0
- Release:	2%{?dist}
+ Release:	1%{?dist}
  URL:		https://collectd.org
  Source:		https://collectd.org/files/%{name}-%{version}.tar.bz2
  License:	GPLv2
@@@ -2560,13 -2512,11 +2560,16 @@@ f
  %doc contrib/
  
  %changelog
- * Tue Aug 23 2016 Marc Fournier <marc.fournier@camptocamp.com> - 5.7.0-1
++* Mon Oct 10 2016 Marc Fournier <marc.fournier@camptocamp.com> - 5.7.0-1
 +- New PRE-RELEASE version
 +- New plugins enabled by default: hugepages
 +- New plugins disabled by default: dpdkstat, intel_rdt
 +
+ * Mon Oct 10 2016 Victor Demonchy <v.demonchy@criteo.com> - 5.6.1-1
+ - New upstream version
+ 
  * Sun Aug 14 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.6.0-1
- - New PRE-RELEASE version
+ - New upstream version
  - New plugins enabled by default: chrony, cpusleep, gps, lua, mqtt, notify_nagios
  - New plugins disabled by default: grpc, xencpu, zone
  
diff --cc src/rrdcached.c
index 3db89b5e,0b904053..6d45ac9f
--- a/src/rrdcached.c
+++ b/src/rrdcached.c
@@@ -291,10 -311,10 +311,11 @@@ static int rc_read (void
  {
    int status;
    rrdc_stats_t *head;
+   _Bool retried = 0;
  
 -  value_t values[1];
    value_list_t vl = VALUE_LIST_INIT;
 +  vl.values = &(value_t) { .gauge = NAN };
 +  vl.values_len = 1;
  
    if (daemon_address == NULL)
      return (-1);