summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes@compute3.221.st>2011-09-07 22:40:05 +0000
committerJohannes Erdfelt <johannes@compute3.221.st>2011-09-07 22:40:05 +0000
commitc70cd1d73682d4380213332cd2a640927d95636c (patch)
tree843fe1cf953d8c13dc2bd0646ae524e996f385e8 /nova/api
parent2655520793dfcfa5b4e779c15abfd2490b193a94 (diff)
parentede50666215d38f037d9783556647889bc88c6bc (diff)
Merge with 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):