Merge "Split out Nova software config"
authorJenkins <jenkins@review.openstack.org>
Wed, 19 Nov 2014 20:25:17 +0000 (20:25 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 19 Nov 2014 20:25:17 +0000 (20:25 +0000)

Trivial merge