Merged PLAN type changes into master 65/18265/1
authorIdan Amit <ia096e@intl.att.com>
Wed, 11 Oct 2017 10:54:30 +0000 (13:54 +0300)
committerIdan Amit <ia096e@intl.att.com>
Wed, 11 Oct 2017 10:54:30 +0000 (13:54 +0300)
commitc4c4e2869573534bbf8154ff4b5aad3a87126c33
treed5c6920b1eed38c6bfe19992e8334f5c2b285d17
parent2423ebd2fbaa1e0fc4f123feb2ce25f1d118c937
Merged PLAN type changes into master

Merged changes regarding the PLAN artifact type from master branch into release-.1.1.0 branch

Change-Id: If53f06d734ca7ba791e4c578504c890c16755ddf
Issue-Id: SDC-420
Signed-off-by: Idan Amit <ia096e@intl.att.com>
catalog-be/src/main/resources/config/configuration.yaml
common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java
sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb