Merge "Add non-pcmk Trove API/Conductor/Taskmanager profiles"
authorJenkins <jenkins@review.openstack.org>
Wed, 6 Jul 2016 18:40:28 +0000 (18:40 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 6 Jul 2016 18:40:29 +0000 (18:40 +0000)

Trivial merge