Merge "Fix retrieval of resourceInputObj in delete e2e"

author Chuanyu Chen <chenchuanyu@huawei.com>

Tue, 27 Nov 2018 09:58:23 +0000 (09:58 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Tue, 27 Nov 2018 09:58:23 +0000 (09:58 +0000)
author Chuanyu Chen <chenchuanyu@huawei.com>
Tue, 27 Nov 2018 09:58:23 +0000 (09:58 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Tue, 27 Nov 2018 09:58:23 +0000 (09:58 +0000)
diff --cc bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeActivateSDNCNetworkResource.groovy
Simple merge
diff --cc bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy
Simple merge
author	Chuanyu Chen <chenchuanyu@huawei.com>
	Tue, 27 Nov 2018 09:58:23 +0000 (09:58 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Tue, 27 Nov 2018 09:58:23 +0000 (09:58 +0000)
		1	2
bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeActivateSDNCNetworkResource.groovy	patch \|	diff1 \|	diff2 \|	blob \| history
bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy	patch \|	diff1 \|	diff2 \|	blob \| history