Merge branch 'collectd-5.6'

diff --cc contrib/redhat/collectd.spec
index f66cb4a,4c136d6..eaf6f31
--- 1/contrib/redhat/collectd.spec
--- 2/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/Makefile.am
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/daemon/common.c
Simple merge

diff --cc src/lua.c
Simple merge

diff --cc src/rrdcached.c
index 3db89b5,0b90405..6d45ac9
--- 1/src/rrdcached.c
--- 2/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);

diff --cc src/tail_csv.c
Simple merge

diff --cc src/vserver.c
Simple merge

diff --cc src/write_redis.c
Simple merge