Merge "Define a general nfv Tosca template(new)"
authorZhipeng (Howard) Huang <huangzhipeng@huawei.com>
Tue, 5 Jan 2016 00:14:12 +0000 (00:14 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 5 Jan 2016 00:14:12 +0000 (00:14 +0000)

Trivial merge