diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-30 11:09:57 -0700 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-30 11:09:57 -0700 |
| commit | 79bcd94f95d83830c5eb90ed841194b102e8601f (patch) | |
| tree | f208ea283d82a623dc1c37eeeb6653aef2669602 /nova/api | |
| parent | d2aa73efed6f4eb731c4fe8dca3f4ceb5b36caeb (diff) | |
| parent | 79915a797e8485307d432ac9155d6e777b16dce7 (diff) | |
Merged with trunk (after faults change to return correct content-type)
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 a05e97021..bc97639a0 100644 --- a/nova/api/openstack/faults.py +++ b/nova/api/openstack/faults.py @@ -61,6 +61,7 @@ class Fault(webob.exc.HTTPException): serializer = wsgi.Serializer(metadata, default_xmlns) 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 |