Merge "Move RabbitMQ settings out of controller.yaml"
authorJenkins <jenkins@review.openstack.org>
Wed, 24 Aug 2016 09:01:05 +0000 (09:01 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 24 Aug 2016 09:01:05 +0000 (09:01 +0000)

Trivial merge