Merge "add collectd resource node capability"
authorRoss Brattain <ross.b.brattain@intel.com>
Mon, 2 Oct 2017 23:41:37 +0000 (23:41 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 2 Oct 2017 23:41:37 +0000 (23:41 +0000)

Trivial merge