diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-03-31 09:29:07 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-03-31 09:29:07 -0400 |
| commit | e90b0cf99cda9b93e93db88fbb2204a1bfcd3897 (patch) | |
| tree | 90e35f0407a6b9abe22ff8987cd4ba540bc80d1a /nova/api | |
| parent | 176d98aa179b174c4e4a5621f723ef7b9145e3cb (diff) | |
| parent | eda275741f5865a1bf58d0176b36d4d99bfeb015 (diff) | |
Merge w/ trunk.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/faults.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/api/openstack/faults.py b/nova/api/openstack/faults.py index 0e9c4b26f..940bd8771 100644 --- a/nova/api/openstack/faults.py +++ b/nova/api/openstack/faults.py @@ -60,6 +60,7 @@ class Fault(webob.exc.HTTPException): serializer = wsgi.Serializer(metadata) content_type = req.best_match_content_type() self.wrapped_exc.body = serializer.serialize(fault_data, content_type) + self.wrapped_exc.content_type = content_type return self.wrapped_exc |