Merge "Make Resources in service-decomp configurable"
authorDan Timoney <dt5972@att.com>
Mon, 20 Aug 2018 16:37:05 +0000 (16:37 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 20 Aug 2018 16:37:05 +0000 (16:37 +0000)

Trivial merge