Merge "set -e in run-os-net-config.sh"
authorJenkins <jenkins@review.openstack.org>
Thu, 19 Jan 2017 10:53:00 +0000 (10:53 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 19 Jan 2017 10:53:00 +0000 (10:53 +0000)

Trivial merge