From c7b3ff20b8f2a1705df595cd273cd6e57cc68ad4 Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade@rackspace.com>
Date: Thu, 8 Mar 2012 19:40:59 +0000
Subject: Renaming user friendly fault name for HTTP 409

Change-Id: I7d2185d71be2ec2ad6ac78f70657047bdf3621e3
---
 nova/api/openstack/wsgi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

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",
-- 
cgit