Merge "update certs fix the issues while toggling the aaf and prometheus flags add...

author Sylvain Desbureaux <sylvain.desbureaux@orange.com>

Thu, 26 Mar 2020 15:49:23 +0000 (15:49 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Thu, 26 Mar 2020 15:49:23 +0000 (15:49 +0000)
author Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Thu, 26 Mar 2020 15:49:23 +0000 (15:49 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Thu, 26 Mar 2020 15:49:23 +0000 (15:49 +0000)
diff --cc kubernetes/dmaap/components/message-router/charts/message-router-kafka/templates/statefulset.yaml
Simple merge
diff --cc kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml
Simple merge
author	Sylvain Desbureaux <sylvain.desbureaux@orange.com>
	Thu, 26 Mar 2020 15:49:23 +0000 (15:49 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Thu, 26 Mar 2020 15:49:23 +0000 (15:49 +0000)
		1	2
kubernetes/dmaap/components/message-router/charts/message-router-kafka/templates/statefulset.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml	patch \|	diff1 \|	diff2 \|	blob \| history