Merge "Add support for 'collectd-master' container"
authorAaron Smith <aasmith@redhat.com>
Mon, 10 Sep 2018 12:01:36 +0000 (12:01 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 10 Sep 2018 12:01:36 +0000 (12:01 +0000)

Trivial merge