summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-01-17 13:05:26 -0500
committerTodd Willey <todd@ansolabs.com>2011-01-17 13:05:26 -0500
commit58c647501254fe6274d348cf768280e3773fe1ec (patch)
tree9b69bcbf04af0164de6cd05ae88bfaf9f8c9dcf9 /nova/exception.py
parent500b268d0ef83b4770f9883690564e458cf94247 (diff)
parent825652456ac826a2108956ba8a9cbdc8221520dc (diff)
downloadnova-58c647501254fe6274d348cf768280e3773fe1ec.tar.gz
nova-58c647501254fe6274d348cf768280e3773fe1ec.tar.xz
nova-58c647501254fe6274d348cf768280e3773fe1ec.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: