summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-03-21 13:44:53 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-03-21 13:44:53 -0400
commit53bc1a077746d5a72addf0f25fa8f25c8dce1990 (patch)
tree0fb1155e6a43317178ab86557c8be8943c94b39b /nova/exception.py
parent58f66ff1d20286b4e321f90f60b3abef2d9ba8c6 (diff)
parentcf84d5bc465823f9342a0a300176a3cf96fbb925 (diff)
downloadnova-53bc1a077746d5a72addf0f25fa8f25c8dce1990.tar.gz
nova-53bc1a077746d5a72addf0f25fa8f25c8dce1990.tar.xz
nova-53bc1a077746d5a72addf0f25fa8f25c8dce1990.zip
merging trunk r837
Diffstat (limited to 'nova/exception.py')
-rw-r--r--nova/exception.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/exception.py b/nova/exception.py
index 93c5fe3d7..4e2bbdbaf 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -46,7 +46,7 @@ class Error(Exception):
class ApiError(Error):
- def __init__(self, message='Unknown', code='Unknown'):
+ def __init__(self, message='Unknown', code='ApiError'):
self.message = message
self.code = code
super(ApiError, self).__init__('%s: %s' % (code, message))