Merge "Edge driver: Improve exception handling"

author Jenkins <jenkins@review.openstack.org>

Sun, 13 Apr 2014 12:16:22 +0000 (12:16 +0000)

committer Gerrit Code Review <review@openstack.org>

Sun, 13 Apr 2014 12:16:22 +0000 (12:16 +0000)
author Jenkins <jenkins@review.openstack.org>
Sun, 13 Apr 2014 12:16:22 +0000 (12:16 +0000)
committer Gerrit Code Review <review@openstack.org>
Sun, 13 Apr 2014 12:16:22 +0000 (12:16 +0000)
diff --cc neutron/plugins/vmware/vshield/edge_appliance_driver.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sun, 13 Apr 2014 12:16:22 +0000 (12:16 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sun, 13 Apr 2014 12:16:22 +0000 (12:16 +0000)