Merge "fix testcase test_check_can_live_migrate_dest_fills_listen_addrs"

author Jenkins <jenkins@review.openstack.org>

Thu, 3 Nov 2016 22:40:50 +0000 (22:40 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 3 Nov 2016 22:40:50 +0000 (22:40 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 3 Nov 2016 22:40:50 +0000 (22:40 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 3 Nov 2016 22:40:50 +0000 (22:40 +0000)
diff --cc nova/tests/unit/virt/libvirt/test_driver.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 3 Nov 2016 22:40:50 +0000 (22:40 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 3 Nov 2016 22:40:50 +0000 (22:40 +0000)