Merge "Apply os-net-config with a script instead of element"
authorJenkins <jenkins@review.openstack.org>
Wed, 30 Nov 2016 15:58:54 +0000 (15:58 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 30 Nov 2016 15:58:54 +0000 (15:58 +0000)

Trivial merge