Merge "Collectd"
authorRoss Brattain <ross.b.brattain@intel.com>
Thu, 10 Aug 2017 03:57:47 +0000 (03:57 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 10 Aug 2017 03:57:47 +0000 (03:57 +0000)

Trivial merge