summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorRyan Lane <rlane@wikimedia.org>2011-03-03 23:04:11 +0000
committerRyan Lane <rlane@wikimedia.org>2011-03-03 23:04:11 +0000
commitdf3a65793ec7bb9d85d2a3da47fbbfb9e97d03d4 (patch)
treeaab853348a2df9f5cdb26a77dd836d4f2083f119 /nova/exception.py
parent4c50ddee48971c76f0f6252295747b89de5d3697 (diff)
parent7ca1669603132e3afd14606dda3f95ccbce08a41 (diff)
downloadnova-df3a65793ec7bb9d85d2a3da47fbbfb9e97d03d4.tar.gz
nova-df3a65793ec7bb9d85d2a3da47fbbfb9e97d03d4.tar.xz
nova-df3a65793ec7bb9d85d2a3da47fbbfb9e97d03d4.zip
Merge from 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