Merge "Support for docker-compose in heat environment"
authorMarcus Williams <marcus.williams@intel.com>
Fri, 3 Aug 2018 14:35:32 +0000 (14:35 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 3 Aug 2018 14:35:32 +0000 (14:35 +0000)

Trivial merge