Merge "Wire in Controller pre-deployment extraconfig"
authorJenkins <jenkins@review.openstack.org>
Wed, 8 Jul 2015 13:04:09 +0000 (13:04 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 8 Jul 2015 13:04:09 +0000 (13:04 +0000)

Trivial merge