summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorCory Wright <cory.wright@rackspace.com>2011-03-10 13:59:43 +0000
committerCory Wright <cory.wright@rackspace.com>2011-03-10 13:59:43 +0000
commit43b5d68b51c08be100bdf63571a6426bb1c4f863 (patch)
tree10a88775f1e0cb7e0b9e23b650b1fd9078f3118e /nova/exception.py
parentfb4785b85c1bef4179140cfb85ce01eca9fb5da5 (diff)
parent144fa5082108f306595c5314f40d7e87cb577278 (diff)
downloadnova-43b5d68b51c08be100bdf63571a6426bb1c4f863.tar.gz
nova-43b5d68b51c08be100bdf63571a6426bb1c4f863.tar.xz
nova-43b5d68b51c08be100bdf63571a6426bb1c4f863.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 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