From: Zhipeng (Howard) Huang <huangzhipeng@huawei.com>
Date: Tue, 5 Jan 2016 00:14:12 +0000 (+0000)
Subject: Merge "Define a general nfv Tosca template(new)"
X-Git-Tag: brahmaputra.1.0~3
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ad5974ac97515d79292d08990dfbfd56b7489ab9;p=parser.git

Merge "Define a general nfv Tosca template(new)"
---

ad5974ac97515d79292d08990dfbfd56b7489ab9