summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-09-08 15:40:30 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-09-08 15:40:30 -0400
commit71d0b4644aa16c2aa792ea47c3b6781ff3252423 (patch)
tree83b03b81312a2d63f86791b5db6fd393ce9ce254 /nova/api
parentb24189ad5df28ae9acfa8fc5feaa8971e676343e (diff)
parent816ae51f6580e3ed20597157f94a4ffd4e690c04 (diff)
merging trunk
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/views/addresses.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/nova/api/openstack/views/addresses.py b/nova/api/openstack/views/addresses.py
index 8f07a2289..8d38bc9c3 100644
--- a/nova/api/openstack/views/addresses.py
+++ b/nova/api/openstack/views/addresses.py
@@ -88,7 +88,6 @@ class ViewBuilderV11(ViewBuilder):
try:
return interface['network']['label']
except (TypeError, KeyError) as exc:
- LOG.exception(exc)
raise TypeError
def _extract_ipv4_addresses(self, interface):