Merged origin/release/1710 branch 15/12915/1
authorIdan Amit <ia096e@intl.att.com>
Sun, 17 Sep 2017 14:10:53 +0000 (17:10 +0300)
committerIdan Amit <ia096e@intl.att.com>
Sun, 17 Sep 2017 14:19:18 +0000 (17:19 +0300)
commitdfb6f09c9577a7cc16272ed37a780fd7ea2a3e74
tree505072fb365cec8cdefc763782bab6f07e3919f5
parent9c94d11d63d9016af74dcf3a2fd72d50955eace2
Merged origin/release/1710 branch

Change-Id: If6900101b206d48112a6b2e25b33957b37083479
Issue-Id: SDC-329
Signed-off-by: Idan Amit <ia096e@intl.att.com>
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CsarValidationUtils.java
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml
catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip