diff options
author | Arthur Martella <amartell@research.att.com> | 2017-09-08 13:27:46 -0400 |
---|---|---|
committer | Arthur Martella <amartell@research.att.com> | 2017-09-08 13:32:24 -0400 |
commit | 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 (patch) | |
tree | 68c0c53c9156f5aa3c6b3599ac940770f986633d /mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml | |
parent | fa1a211d28a912892fcd888569df033900eb01ee (diff) |
1710 Rebase - Second Attempt
This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400
Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000
Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>
Diffstat (limited to 'mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml')
-rw-r--r-- | mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml b/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml index 90ae8ab2ea..b89a93cd96 100644 --- a/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml +++ b/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml @@ -27,12 +27,12 @@ </meta> <composite-id> - <key-property name="parentTemplateId" column="PARENT_TEMPLATE_ID" type="int" /> - <key-property name="childTemplateId" column="CHILD_TEMPLATE_ID" type="int" /> + <key-property name="parentTemplateId" column="PARENT_HEAT_TEMPLATE_UUID" type="string" length="200"/> + <key-property name="childTemplateId" column="CHILD_HEAT_TEMPLATE_UUID" type="string" length="200"/> </composite-id> <property name="providerResourceFile" column="PROVIDER_RESOURCE_FILE" type="string" length="100"/> </class> -</hibernate-mapping> +</hibernate-mapping>
\ No newline at end of file |