Merge "Implement Nova conductor profile"
authorJenkins <jenkins@review.openstack.org>
Mon, 6 Jun 2016 12:26:31 +0000 (12:26 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 6 Jun 2016 12:26:31 +0000 (12:26 +0000)

Trivial merge