Merge "install controlloop drools applications"

author Borislav Glozman <Borislav.Glozman@amdocs.com>

Tue, 8 May 2018 12:41:16 +0000 (12:41 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Tue, 8 May 2018 12:41:16 +0000 (12:41 +0000)
author Borislav Glozman <Borislav.Glozman@amdocs.com>
Tue, 8 May 2018 12:41:16 +0000 (12:41 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Tue, 8 May 2018 12:41:16 +0000 (12:41 +0000)
diff --cc kubernetes/policy/charts/drools/templates/statefulset.yaml
Simple merge
diff --cc kubernetes/policy/charts/mariadb/templates/deployment.yaml
Simple merge
author	Borislav Glozman <Borislav.Glozman@amdocs.com>
	Tue, 8 May 2018 12:41:16 +0000 (12:41 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Tue, 8 May 2018 12:41:16 +0000 (12:41 +0000)
		1	2
kubernetes/policy/charts/drools/templates/statefulset.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
kubernetes/policy/charts/mariadb/templates/deployment.yaml	patch \|	diff1 \|	diff2 \|	blob \| history