Merge "makefile: update collectd Makefile with intel_pmu configuration"
authorMaryam Tahhan <maryam.tahhan@intel.com>
Fri, 19 May 2017 12:10:13 +0000 (12:10 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 19 May 2017 12:10:13 +0000 (12:10 +0000)

Trivial merge