Heat reupload component dependency issue fix 65/27265/3
authorojasdubey <ojas.dubey@amdocs.com>
Wed, 3 Jan 2018 12:23:32 +0000 (17:53 +0530)
committerVitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com>
Thu, 4 Jan 2018 11:28:53 +0000 (11:28 +0000)
commitc09a82325a1518bd1fce7221b9be2fac32511f2d
tree68d9218cbb8db5edb73a57091486d4f5a8668655
parenta9602f8f97a64cc1855b5228bfc3c7502c82fe92
Heat reupload component dependency issue fix

Resolved merge conflict

Change-Id: Ib9561aa7d5814c3dd9c6015214d656a2800984a9
Issue-ID: SDC-872
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/OrchestrationUtil.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/process/OrchestrationTemplateProcessZipHandler.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImplTest.java