Merge "Mv Nova, Neutron, Horizon out of controller.yaml"
authorJenkins <jenkins@review.openstack.org>
Tue, 30 Aug 2016 17:35:18 +0000 (17:35 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 30 Aug 2016 17:35:18 +0000 (17:35 +0000)

Trivial merge