Merge "Controller: Drive os-net-config via software conf"
authorJenkins <jenkins@review.openstack.org>
Thu, 8 Jan 2015 14:39:31 +0000 (14:39 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 8 Jan 2015 14:39:31 +0000 (14:39 +0000)
1  2 
controller.yaml

diff --cc controller.yaml
Simple merge