Merge "Puppet: overcloud compute config"
authorJenkins <jenkins@review.openstack.org>
Thu, 8 Jan 2015 08:17:23 +0000 (08:17 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 8 Jan 2015 08:17:23 +0000 (08:17 +0000)

Trivial merge