Merge "Integrate Holmes with DCAE"
authortang peng <tang.peng5@zte.com.cn>
Mon, 18 Sep 2017 00:22:34 +0000 (00:22 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 18 Sep 2017 00:22:34 +0000 (00:22 +0000)

Trivial merge