From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 28 May 2015 13:44:31 +0000 (+0000)
Subject: Merge "Fix colocation order to match ref-arch"
X-Git-Tag: opnfv-6.0.0~2530
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=341fae89f51f7296168d4cc0119b8afab2fa4a6b;p=apex-tripleo-heat-templates.git

Merge "Fix colocation order to match ref-arch"
---

341fae89f51f7296168d4cc0119b8afab2fa4a6b