Merge "Add zaqar to the controller's list of services in roles_data.yaml"
authorJenkins <jenkins@review.openstack.org>
Fri, 2 Dec 2016 18:06:33 +0000 (18:06 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 2 Dec 2016 18:06:33 +0000 (18:06 +0000)

Trivial merge