[sdc] 1710 rebase code 59/6159/1
authorMichael Lando <ml636r@att.com>
Sat, 22 Jul 2017 14:10:02 +0000 (17:10 +0300)
committerMichael Lando <ml636r@att.com>
Sat, 22 Jul 2017 14:10:02 +0000 (17:10 +0300)
commit9db4052423f34a76296ffdcda896cdeba2b4aead
tree7c3b779c6d09be40283158382dee2cf02767761e
parent3c3c833897dbfc0e85feaf36086a505f990ecb76
[sdc] 1710 rebase code

Change-Id: Icedeac71c0a9d27518969effcd5d5519de9955a6
Signed-off-by: Michael Lando <ml636r@att.com>
34 files changed:
asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/devCI/HealthCheckAPI.java
asdctool/src/main/java/org/openecomp/sdc/asdctool/enums/SchemaZipFileEnum.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/main/SdcSchemaFileImport.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/HealthCheckBusinessLogic.java
catalog-be/src/main/resources/config/SDC.zip [deleted file]
catalog-be/src/main/resources/config/license.txt [new file with mode: 0644]
catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.yml [new file with mode: 0644]
catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip [new file with mode: 0644]
catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml [new file with mode: 0644]
catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip [new file with mode: 0644]
catalog-be/src/test/java/org/openecomp/sdc/be/tosca/SchemaFiles.java [new file with mode: 0644]
catalog-be/src/test/resources/yamlValidation/test-no-valid.yml [new file with mode: 0644]
catalog-be/src/test/resources/yamlValidation/testDir/test.txt [new file with mode: 0644]
catalog-be/src/test/resources/yamlValidation/testDir/test.yml [new file with mode: 0644]
catalog-be/src/test/resources/yamlValidation/testDir/test.zip [new file with mode: 0644]
catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/HealthCheckService.java
catalog-fe/src/main/resources/config/configuration.yaml
catalog-ui/src/app/directives/graphs-v2/common/style/component-instances-nodes-style.ts
catalog-ui/src/app/directives/graphs-v2/composition-graph/composition-graph.directive.ts
catalog-ui/src/app/directives/graphs-v2/image-creator/image-creator.service.ts
catalog-ui/src/app/models/graph/nodes/base-common-node.ts
catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-base.ts
catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-cp.ts
catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-service.ts
catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-vf.ts
catalog-ui/src/app/models/graph/nodes/composition-graph-nodes/composition-ci-node-vl.ts
catalog-ui/src/app/ng2/shared/search-bar/search-bar.component.ts
catalog-ui/src/app/utils/constants.ts
catalog-ui/src/third-party/cytoscape.js-edge-editation/CytoscapeEdgeEditation.js
common-app-api/src/main/java/org/openecomp/sdc/fe/config/Configuration.java
pom.xml
sdc-os-chef/sdc-backend/Dockerfile
sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb
sdc-os-chef/sdc-sanity/Dockerfile