summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorAndy Smith <code@term.ie>2011-01-14 17:57:42 -0800
committerAndy Smith <code@term.ie>2011-01-14 17:57:42 -0800
commit9750e4ab3e41d3f4205b0df56ef8200744c327a0 (patch)
treebe886950dae9603636e0d3bc08e85937621d6990 /nova/exception.py
parenteb6021ad9489185418f545a54e1d415ba6c3429d (diff)
parent34ceed1ce114ab01eca06eced00a204ae71dc3db (diff)
downloadnova-9750e4ab3e41d3f4205b0df56ef8200744c327a0.tar.gz
nova-9750e4ab3e41d3f4205b0df56ef8200744c327a0.tar.xz
nova-9750e4ab3e41d3f4205b0df56ef8200744c327a0.zip
merge from upstream
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: