Merge "Move nova-scheduler data into puppet_config"
authorJenkins <jenkins@review.openstack.org>
Thu, 9 Mar 2017 13:35:55 +0000 (13:35 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 9 Mar 2017 13:35:55 +0000 (13:35 +0000)

Trivial merge