Merge "CDS client gRPC SSL/TLS support"

author Steve Smokowski <ss835w@att.com>

Tue, 4 Aug 2020 10:42:46 +0000 (10:42 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Tue, 4 Aug 2020 10:42:46 +0000 (10:42 +0000)
author Steve Smokowski <ss835w@att.com>
Tue, 4 Aug 2020 10:42:46 +0000 (10:42 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Tue, 4 Aug 2020 10:42:46 +0000 (10:42 +0000)
diff --cc common/pom.xml
Simple merge
diff --cc pom.xml
Simple merge
author	Steve Smokowski <ss835w@att.com>
	Tue, 4 Aug 2020 10:42:46 +0000 (10:42 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Tue, 4 Aug 2020 10:42:46 +0000 (10:42 +0000)
		1	2
common/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history