Merge "Fix race in test_volume_swap_server_with_error"

author Jenkins <jenkins@review.openstack.org>

Mon, 12 Dec 2016 06:51:43 +0000 (06:51 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 12 Dec 2016 06:51:44 +0000 (06:51 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 12 Dec 2016 06:51:43 +0000 (06:51 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 12 Dec 2016 06:51:44 +0000 (06:51 +0000)
diff --cc nova/tests/functional/notification_sample_tests/test_instance.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 12 Dec 2016 06:51:43 +0000 (06:51 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 12 Dec 2016 06:51:44 +0000 (06:51 +0000)