Merge "Fix the bug of cannot return multiple versions of particular tosca policy...

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

Tue, 18 Jun 2019 12:20:57 +0000 (12:20 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Tue, 18 Jun 2019 12:20:57 +0000 (12:20 +0000)
author Pamela Dragosh <pdragosh@research.att.com>
Tue, 18 Jun 2019 12:20:57 +0000 (12:20 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Tue, 18 Jun 2019 12:20:57 +0000 (12:20 +0000)
diff --cc models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProviderPolicyTypeTest.java
Simple merge
author	Pamela Dragosh <pdragosh@research.att.com>
	Tue, 18 Jun 2019 12:20:57 +0000 (12:20 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Tue, 18 Jun 2019 12:20:57 +0000 (12:20 +0000)