Merge "docker: don't use custom run-os-net-config"
authorJenkins <jenkins@review.openstack.org>
Tue, 13 Dec 2016 14:35:29 +0000 (14:35 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 13 Dec 2016 14:35:29 +0000 (14:35 +0000)

Trivial merge