Merge "The artifacttype's parent_type definition is error"
authorjulien zhang <zhang.jun3g@zte.com.cn>
Mon, 4 Jul 2016 10:03:58 +0000 (10:03 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 4 Jul 2016 10:03:58 +0000 (10:03 +0000)
commit5eb53e8aa498bf080ff52cbddf3070be83292c3c
tree2ce2f039e509a296874c536db3cc2c2169a8fabf
parentd3ec79a8d3146b88892cf6d7fdf843ccd7e3a0b0
parent32a4ee56e1dfbe986aab75bc7924057790c189cf
Merge "The artifacttype's parent_type definition is error"
tosca2heat/tosca-parser/toscaparser/tests/test_toscadef.py