Merge "InputResourceResolutionProcessorTest re-enabled"
authorDan Timoney <dtimoney@att.com>
Tue, 25 Jun 2019 18:53:57 +0000 (18:53 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 25 Jun 2019 18:53:57 +0000 (18:53 +0000)

Trivial merge