Merge "Support multiple Policy/Controller types using 'controller.type' property"

author Jorge Hernandez <jorge.hernandez-herrero@att.com>

Tue, 21 Jul 2020 23:29:12 +0000 (23:29 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Tue, 21 Jul 2020 23:29:12 +0000 (23:29 +0000)
author Jorge Hernandez <jorge.hernandez-herrero@att.com>
Tue, 21 Jul 2020 23:29:12 +0000 (23:29 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Tue, 21 Jul 2020 23:29:12 +0000 (23:29 +0000)
diff --cc policy-management/src/main/java/org/onap/policy/drools/system/IndexedPolicyControllerFactory.java
Simple merge
diff --cc policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java
Simple merge
author	Jorge Hernandez <jorge.hernandez-herrero@att.com>
	Tue, 21 Jul 2020 23:29:12 +0000 (23:29 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Tue, 21 Jul 2020 23:29:12 +0000 (23:29 +0000)
		1	2
policy-management/src/main/java/org/onap/policy/drools/system/IndexedPolicyControllerFactory.java	patch \|	diff1 \|	diff2 \|	blob \| history
policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java	patch \|	diff1 \|	diff2 \|	blob \| history