Merge "Switch to cambria client 1.2.1-oss"

author Pamela Dragosh <pdragosh@research.att.com>

Mon, 16 Apr 2018 14:50:54 +0000 (14:50 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Mon, 16 Apr 2018 14:50:54 +0000 (14:50 +0000)
author Pamela Dragosh <pdragosh@research.att.com>
Mon, 16 Apr 2018 14:50:54 +0000 (14:50 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Mon, 16 Apr 2018 14:50:54 +0000 (14:50 +0000)
diff --cc policy-endpoints/pom.xml
Simple merge
diff --cc policy-management/pom.xml
Simple merge
diff --cc pom.xml
Simple merge
author	Pamela Dragosh <pdragosh@research.att.com>
	Mon, 16 Apr 2018 14:50:54 +0000 (14:50 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Mon, 16 Apr 2018 14:50:54 +0000 (14:50 +0000)
		1	2
policy-endpoints/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
policy-management/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history