From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 6 Jul 2016 18:40:28 +0000 (+0000)
Subject: Merge "Add non-pcmk Trove API/Conductor/Taskmanager profiles"
X-Git-Tag: opnfv-6.0.0~697
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9f0ab60383509548e91740ec6559ab9af0f04199;p=apex-puppet-tripleo.git

Merge "Add non-pcmk Trove API/Conductor/Taskmanager profiles"
---

9f0ab60383509548e91740ec6559ab9af0f04199