Merge "Fix cold/live migration network config" into stable/pike
authorJenkins <jenkins@review.openstack.org>
Tue, 10 Oct 2017 01:12:03 +0000 (01:12 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 10 Oct 2017 01:12:03 +0000 (01:12 +0000)

Trivial merge