From: Fu Jinhua <fu.jinhua@zte.com.cn>
Date: Sat, 10 Nov 2018 03:31:00 +0000 (+0000)
Subject: Merge "fix vnfmodel error"
X-Git-Tag: 1.2.1~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=69e8df4924955330f03e5cc73e64653a312d0b57;p=vfc%2Fnfvo%2Fcatalog.git

Merge "fix vnfmodel error"
---

69e8df4924955330f03e5cc73e64653a312d0b57