From: Marcus Williams <marcus.williams@intel.com>
Date: Fri, 3 Aug 2018 14:35:32 +0000 (+0000)
Subject: Merge "Support for docker-compose in heat environment"
X-Git-Tag: 3.0.0-ONAP~31
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=156facd9f7b02ee695135a87e156f2ab80caa2e5;p=so%2Fdocker-config.git

Merge "Support for docker-compose in heat environment"
---

156facd9f7b02ee695135a87e156f2ab80caa2e5