diff options
| author | Monsyne Dragon <mdragon@rackspace.com> | 2011-03-11 19:49:32 +0000 |
|---|---|---|
| committer | Monsyne Dragon <mdragon@rackspace.com> | 2011-03-11 19:49:32 +0000 |
| commit | c91fc7c44c87814d76c1c8bc74b27279fa054cad (patch) | |
| tree | 60e6dcfde95bc91b964804cffb07b9608f1e9fbc /nova/exception.py | |
| parent | 7e95a65ccec2336176f389d614a85c9e70da374d (diff) | |
| parent | 7ca1669603132e3afd14606dda3f95ccbce08a41 (diff) | |
| download | nova-c91fc7c44c87814d76c1c8bc74b27279fa054cad.tar.gz nova-c91fc7c44c87814d76c1c8bc74b27279fa054cad.tar.xz nova-c91fc7c44c87814d76c1c8bc74b27279fa054cad.zip | |
remerge trunk (again). fix issues caused by changes to deserialization calls on controllers.
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 |