diff options
| author | Christian Berendt <berendt@b1-systems.de> | 2011-03-15 08:45:35 +0100 |
|---|---|---|
| committer | Christian Berendt <berendt@b1-systems.de> | 2011-03-15 08:45:35 +0100 |
| commit | a5bf9b4561d8ff0113406a975518b5fd4a4d3bd8 (patch) | |
| tree | 97ba2c68e52189f1f0482fd29247194bf43bd21c /nova/exception.py | |
| parent | f72e5b618387a7b5a06f0e5b7e68af51c6667327 (diff) | |
| parent | 5da32f8b917d461388d0186af52946a3f7d2c665 (diff) | |
| download | nova-a5bf9b4561d8ff0113406a975518b5fd4a4d3bd8.tar.gz nova-a5bf9b4561d8ff0113406a975518b5fd4a4d3bd8.tar.xz nova-a5bf9b4561d8ff0113406a975518b5fd4a4d3bd8.zip | |
merged with trunk and removed conflicts
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 7d65bd6a5..93c5fe3d7 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -88,6 +88,10 @@ class InvalidInputException(Error): pass +class InvalidContentType(Error): + pass + + class TimeoutException(Error): pass |