summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2011-01-17 11:16:36 -0600
committerRick Harris <rick.harris@rackspace.com>2011-01-17 11:16:36 -0600
commitb5445da21b9ae91308e2adecc7aaa8e56e278d50 (patch)
tree43c7d4de0830230da714888d91e7f1142e62d3d2 /nova/exception.py
parent0d6882fb2a3ec3b45b28120d00b8b4ff5fbc9187 (diff)
parent825652456ac826a2108956ba8a9cbdc8221520dc (diff)
Merging 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: