Merge "Prod fixes August 18th"

author Rob Daugherty <rd472p@att.com>

Thu, 23 Aug 2018 13:51:56 +0000 (13:51 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Thu, 23 Aug 2018 13:51:56 +0000 (13:51 +0000)
author Rob Daugherty <rd472p@att.com>
Thu, 23 Aug 2018 13:51:56 +0000 (13:51 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Thu, 23 Aug 2018 13:51:56 +0000 (13:51 +0000)
diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
Simple merge
diff --cc bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
Simple merge
author	Rob Daugherty <rd472p@att.com>
	Thu, 23 Aug 2018 13:51:56 +0000 (13:51 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Thu, 23 Aug 2018 13:51:56 +0000 (13:51 +0000)
		1	2
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java	patch \|	diff1 \|	diff2 \|	blob \| history
bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java	patch \|	diff1 \|	diff2 \|	blob \| history