Merge "The relationship type's parent_type definition is not complete"
authorjulien zhang <zhang.jun3g@zte.com.cn>
Thu, 30 Jun 2016 16:25:55 +0000 (16:25 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 30 Jun 2016 16:25:55 +0000 (16:25 +0000)

Trivial merge