Merge "Don't try to run os-net-config from yum_update.sh" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Tue, 28 Mar 2017 05:57:52 +0000 (05:57 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 28 Mar 2017 05:57:53 +0000 (05:57 +0000)

Trivial merge