diff options
author | Ewan Mellor <ewan.mellor@citrix.com> | 2011-01-14 15:51:42 +0000 |
---|---|---|
committer | Ewan Mellor <ewan.mellor@citrix.com> | 2011-01-14 15:51:42 +0000 |
commit | b8c45af21d38e476d8f667089fc03b347d7969e2 (patch) | |
tree | e79cd390331ca2053e5432b214ddb826eba87bc5 /nova/exception.py | |
parent | c71d5d41bb6e5d7a046a76563eed75a4d6e77e90 (diff) | |
parent | 9fb1e7b1f627b10fda1249754e4bc612d697110c (diff) | |
download | nova-b8c45af21d38e476d8f667089fc03b347d7969e2.tar.gz nova-b8c45af21d38e476d8f667089fc03b347d7969e2.tar.xz nova-b8c45af21d38e476d8f667089fc03b347d7969e2.zip |
Merged with trunk revno 565.
Diffstat (limited to 'nova/exception.py')
-rw-r--r-- | nova/exception.py | 4 |
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: |