summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-09-21 21:47:25 +0000
committerGerrit Code Review <review@openstack.org>2012-09-21 21:47:25 +0000
commit3b69895b4c8ff78e6f986fc7e60c724428e3ca0b (patch)
tree406d17c458e49af8a49cd87f7d6795f049b97f80 /nova/api
parent9dc1b976cf0fa12fb3be673f5269212cde11c740 (diff)
parent4c09d809c9bd37eeb55f64ec01f8a0b900f9a3bf (diff)
downloadnova-3b69895b4c8ff78e6f986fc7e60c724428e3ca0b.tar.gz
nova-3b69895b4c8ff78e6f986fc7e60c724428e3ca0b.tar.xz
nova-3b69895b4c8ff78e6f986fc7e60c724428e3ca0b.zip
Merge "Cleanup exception handling"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/floating_ips.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py
index f3692e02e..be952eb8a 100644
--- a/nova/api/openstack/compute/contrib/floating_ips.py
+++ b/nova/api/openstack/compute/contrib/floating_ips.py
@@ -175,7 +175,7 @@ class FloatingIPController(object):
nmfi.message = _("No more floating ips in pool %s.") % pool
else:
nmfi.message = _("No more floating ips available.")
- raise nmfi
+ raise
return _translate_floating_ip_view(ip)