Merge "Adding PolicyType to getConfig Response"

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

Wed, 3 Jan 2018 20:19:17 +0000 (20:19 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Wed, 3 Jan 2018 20:19:17 +0000 (20:19 +0000)
author Pamela Dragosh <pdragosh@research.att.com>
Wed, 3 Jan 2018 20:19:17 +0000 (20:19 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Wed, 3 Jan 2018 20:19:17 +0000 (20:19 +0000)
diff --cc ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java
Simple merge
diff --cc ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdatePolicyServiceImpl.java
Simple merge
author	Pamela Dragosh <pdragosh@research.att.com>
	Wed, 3 Jan 2018 20:19:17 +0000 (20:19 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Wed, 3 Jan 2018 20:19:17 +0000 (20:19 +0000)
		1	2
ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java	patch \|	diff1 \|	diff2 \|	blob \| history
ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdatePolicyServiceImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history