Merge "Implementing scope and action values from SO-DB to SO-Backend"

author Steve Smokowski <ss835w@att.com>

Wed, 18 Dec 2019 21:00:33 +0000 (21:00 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Wed, 18 Dec 2019 21:00:33 +0000 (21:00 +0000)
author Steve Smokowski <ss835w@att.com>
Wed, 18 Dec 2019 21:00:33 +0000 (21:00 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Wed, 18 Dec 2019 21:00:33 +0000 (21:00 +0000)
diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
Simple merge
diff --cc mso-catalog-db/src/test/resources/schema.sql
Simple merge
author	Steve Smokowski <ss835w@att.com>
	Wed, 18 Dec 2019 21:00:33 +0000 (21:00 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Wed, 18 Dec 2019 21:00:33 +0000 (21:00 +0000)
		1	2
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java	patch \|	diff1 \|	diff2 \|	blob \| history
mso-catalog-db/src/test/resources/schema.sql	patch \|	diff1 \|	diff2 \|	blob \| history