summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-01-17 13:51:00 -0500
committerTodd Willey <todd@ansolabs.com>2011-01-17 13:51:00 -0500
commitb156f7d9593135a0ab3de83c25643bb0201e2747 (patch)
treecaa5fde89f8aeddc2b2e307dc946dd91d2cb37eb /nova/exception.py
parente88bd8cd04b32818f693910fac772016a542e1da (diff)
parent6906137b99181925f091ca547d019499c3bc1701 (diff)
downloadnova-b156f7d9593135a0ab3de83c25643bb0201e2747.tar.gz
nova-b156f7d9593135a0ab3de83c25643bb0201e2747.tar.xz
nova-b156f7d9593135a0ab3de83c25643bb0201e2747.zip
Merge trunk
Diffstat (limited to 'nova/exception.py')
-rw-r--r--nova/exception.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/exception.py b/nova/exception.py
index 7680e534a..ecd814e5d 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -76,6 +76,10 @@ class InvalidInputException(Error):
pass
+class TimeoutException(Error):
+ pass
+
+
def wrap_exception(f):
def _wrap(*args, **kw):
try: