From: julien zhang <zhang.jun3g@zte.com.cn>
Date: Mon, 4 Jul 2016 10:03:58 +0000 (+0000)
Subject: Merge "The artifacttype's parent_type definition is error"
X-Git-Tag: colorado.1.0~67
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5eb53e8aa498bf080ff52cbddf3070be83292c3c;p=parser.git

Merge "The artifacttype's parent_type definition is error"
---

5eb53e8aa498bf080ff52cbddf3070be83292c3c