Merge "Use POD descriptor file in daisy"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Mon, 3 Jul 2017 17:42:31 +0000 (17:42 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 3 Jul 2017 17:42:31 +0000 (17:42 +0000)

Trivial merge