summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/wsgi.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index 665ee2f26..f592a0ee3 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -1025,7 +1025,7 @@ class Fault(webob.exc.HTTPException):
403: "resizeNotAllowed",
404: "itemNotFound",
405: "badMethod",
- 409: "inProgress", # FIXME(comstud): This doesn't seem right
+ 409: "conflictingRequest",
413: "overLimit",
415: "badMediaType",
501: "notImplemented",