summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2012-03-08 19:40:59 +0000
committerAlex Meade <alex.meade@rackspace.com>2012-03-08 19:41:30 +0000
commitc7b3ff20b8f2a1705df595cd273cd6e57cc68ad4 (patch)
tree5b14e10561ca37546a4a94c2cbf4fd3bcb019db7 /nova/api
parenta3b799e3e6e39ca25627d2b9a2dfa9871ba00a29 (diff)
downloadnova-c7b3ff20b8f2a1705df595cd273cd6e57cc68ad4.tar.gz
nova-c7b3ff20b8f2a1705df595cd273cd6e57cc68ad4.tar.xz
nova-c7b3ff20b8f2a1705df595cd273cd6e57cc68ad4.zip
Renaming user friendly fault name for HTTP 409
Change-Id: I7d2185d71be2ec2ad6ac78f70657047bdf3621e3
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",