Merge "Move get_instance() calls from try-except block"

author Jenkins <jenkins@review.openstack.org>

Sat, 10 Dec 2016 05:15:55 +0000 (05:15 +0000)

committer Gerrit Code Review <review@openstack.org>

Sat, 10 Dec 2016 05:15:55 +0000 (05:15 +0000)
author Jenkins <jenkins@review.openstack.org>
Sat, 10 Dec 2016 05:15:55 +0000 (05:15 +0000)
committer Gerrit Code Review <review@openstack.org>
Sat, 10 Dec 2016 05:15:55 +0000 (05:15 +0000)
diff --cc nova/api/openstack/compute/security_groups.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sat, 10 Dec 2016 05:15:55 +0000 (05:15 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sat, 10 Dec 2016 05:15:55 +0000 (05:15 +0000)