diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-08 21:48:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-08 21:48:41 +0000 |
| commit | ec9668126ae7a7919e66dd7d90e3d772b2758614 (patch) | |
| tree | 11d56ea579766901d0abc794fa5f982fb70b98df /nova/api | |
| parent | 5555446d877223341c2723e4be169d996ab2ce3b (diff) | |
| parent | c7b3ff20b8f2a1705df595cd273cd6e57cc68ad4 (diff) | |
Merge "Renaming user friendly fault name for HTTP 409"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/wsgi.py | 2 |
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", |