Merge "Transform instance.unshelve notifications"

author Jenkins <jenkins@review.openstack.org>

Thu, 3 Nov 2016 16:07:43 +0000 (16:07 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 3 Nov 2016 16:07:43 +0000 (16:07 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 3 Nov 2016 16:07:43 +0000 (16:07 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 3 Nov 2016 16:07:43 +0000 (16:07 +0000)
diff --cc nova/compute/manager.py
Simple merge
diff --cc nova/notifications/objects/instance.py
Simple merge
diff --cc nova/tests/functional/notification_sample_tests/test_instance.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 3 Nov 2016 16:07:43 +0000 (16:07 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 3 Nov 2016 16:07:43 +0000 (16:07 +0000)
		1	2
nova/compute/manager.py	patch \|	diff1 \|	diff2 \|	blob \| history
nova/notifications/objects/instance.py	patch \|	diff1 \|	diff2 \|	blob \| history
nova/tests/functional/notification_sample_tests/test_instance.py	patch \|	diff1 \|	diff2 \|	blob \| history