Renaming user friendly fault name for HTTP 409

Change-Id: I7d2185d71be2ec2ad6ac78f70657047bdf3621e3
2012-03-08 19:40:59 +00:00
parent a3b799e3e6
commit c7b3ff20b8
1 changed files with 1 additions and 1 deletions
--- 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",