merge 1710 to 1.1.0 19/20519/1
authorYuli Shlosberg <ys9693@att.com>
Wed, 25 Oct 2017 08:52:17 +0000 (11:52 +0300)
committerYuli Shlosberg <ys9693@att.com>
Wed, 25 Oct 2017 08:52:17 +0000 (11:52 +0300)
commitfa9d07d3ed584cadbb44de89c886d92591eae23f
tree36f8261be8d23c14490becdbb7cda0bdaa8a0afc
parent85dbef53f19b4504ace0ab170af8904b5749279c
merge 1710 to 1.1.0

Change-Id: I75bec14b00e780b2e1c819237139b02453c4a359
Issue-Id: SDC-522
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogicTest.java
catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/BaseOperation.java
catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperation.java
catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementLifecycleOperation.java