gerrit.onap Code Review - sdc.git/commit

[SDC] 1710 rebase

Change-Id: Ib07b7baacc68a357d302ee591e1fe74151dcea96
Signed-off-by: Michael Lando <ml636r@att.com>

asdctool/src/main/java/org/openecomp/sdc/asdctool/main/SdcSchemaFileImport.java		diff \| blob \| history
catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json		diff \| blob \| history
sdc-os-chef/sdc-os-common/templates/default/BE-configuration.yaml.erb		diff \| blob \| history
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/US/AddComponentInstancesArtifactsInCsar.java		diff \| blob \| history
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/US/LocalGeneralUtilities.java		diff \| blob \| history
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/US/VfModule.java		diff \| blob \| history
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/AmdocsLicenseMembers.java	[new file with mode: 0644]	blob
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/Onboard.java		diff \| blob \| history
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/OnboardViaApis.java		diff \| blob \| history
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/VFCArtifacts.java		diff \| blob \| history
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/OnboardingUtils.java		diff \| blob \| history

SDC Parent Project Catalog FE and BE