From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 6 Jun 2017 08:31:07 +0000 (+0200)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~147
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=1035fba8812893e50d00a871e3399cc1ece3b384

Merge branch 'collectd-5.7'

Conflicts:
	src/intel_rdt.c
---

1035fba8812893e50d00a871e3399cc1ece3b384
diff --cc src/intel_rdt.c
index 2e0fe0fc,6f157b8f..7966daa5
--- a/src/intel_rdt.c
+++ b/src/intel_rdt.c
@@@ -568,7 -546,7 +563,7 @@@ static int rdt_config(oconfig_item_t *c
             reports a failure in configuration and
             aborts
           */
-         goto exit;
 -	return (0);
++        return (0);
        }
  
  #if COLLECT_DEBUG
@@@ -580,8 -557,7 +574,7 @@@
      }
    }
  
- exit:
 -  return (0);
 +  return 0;
  }
  
  static void rdt_submit_derive(char *cgroup, char *type, char *type_instance,