From: julien zhang <zhang.jun3g@zte.com.cn>
Date: Mon, 4 Jul 2016 10:05:45 +0000 (+0000)
Subject: Merge "EntityTemplate has no property of parent_type"
X-Git-Tag: colorado.1.0~66
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ff5fc2fc822ea6833e8291c129176b87e15dc2a9;p=parser.git

Merge "EntityTemplate has no property of parent_type"
---

ff5fc2fc822ea6833e8291c129176b87e15dc2a9