Merge "Move Nova settings out of puppet/compute.yaml"
authorJenkins <jenkins@review.openstack.org>
Tue, 16 Aug 2016 20:17:07 +0000 (20:17 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 16 Aug 2016 20:17:07 +0000 (20:17 +0000)

Trivial merge