Merge "Don't attempt to configure live migration"
authorJenkins <jenkins@review.openstack.org>
Mon, 24 Apr 2017 13:12:00 +0000 (13:12 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 24 Apr 2017 13:12:00 +0000 (13:12 +0000)

Trivial merge