Merge "NONRTRIC Dmaapadapter config correction"

author John Keeney <john.keeney@est.tech>

Thu, 27 Oct 2022 18:11:03 +0000 (18:11 +0000)

committer Gerrit Code Review <gerrit@o-ran-sc.org>

Thu, 27 Oct 2022 18:11:03 +0000 (18:11 +0000)
author John Keeney <john.keeney@est.tech>
Thu, 27 Oct 2022 18:11:03 +0000 (18:11 +0000)
committer Gerrit Code Review <gerrit@o-ran-sc.org>
Thu, 27 Oct 2022 18:11:03 +0000 (18:11 +0000)
diff --cc nonrtric/helm/dmaapadapterservice/resources/config/application.yaml
Simple merge
diff --cc smo-install/oran_oom/dmaapadapterservice/resources/config/application.yaml
Simple merge
author	John Keeney <john.keeney@est.tech>
	Thu, 27 Oct 2022 18:11:03 +0000 (18:11 +0000)
committer	Gerrit Code Review <gerrit@o-ran-sc.org>
	Thu, 27 Oct 2022 18:11:03 +0000 (18:11 +0000)
		1	2
nonrtric/helm/dmaapadapterservice/resources/config/application.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
smo-install/oran_oom/dmaapadapterservice/resources/config/application.yaml	patch \|	diff1 \|	diff2 \|	blob \| history