Merge "EntityTemplate has no property of parent_type"
authorjulien zhang <zhang.jun3g@zte.com.cn>
Mon, 4 Jul 2016 10:05:45 +0000 (10:05 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 4 Jul 2016 10:05:45 +0000 (10:05 +0000)
commitff5fc2fc822ea6833e8291c129176b87e15dc2a9
treece3f79e6f2e3b046ca7bba9480dbdb9081f5f8e5
parent5eb53e8aa498bf080ff52cbddf3070be83292c3c
parent898719f261d68f822e3ab14c1466e893dd70f2a7
Merge "EntityTemplate has no property of parent_type"
tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py