Merge "Wire in Compute pre-deployment extraconfig"
authorJenkins <jenkins@review.openstack.org>
Tue, 18 Aug 2015 19:14:03 +0000 (19:14 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 18 Aug 2015 19:14:03 +0000 (19:14 +0000)

Trivial merge