diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-12 20:57:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-12 20:57:11 +0000 |
| commit | 74384cd16a7301715333208941115827f1bdd375 (patch) | |
| tree | 8363d46f9a43fe10f63a2dbb7017e7abdc841a52 | |
| parent | f0b67f77818fa8a0c0201212ba71344ebe7881cb (diff) | |
| parent | d6d0a67c5cbbee6cabd90ed563b9b9c35d724a94 (diff) | |
Merge "Add missing webob to exc"
| -rw-r--r-- | nova/api/openstack/compute/contrib/deferred_delete.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/deferred_delete.py b/nova/api/openstack/compute/contrib/deferred_delete.py index ea7ac00f9..14b608677 100644 --- a/nova/api/openstack/compute/contrib/deferred_delete.py +++ b/nova/api/openstack/compute/contrib/deferred_delete.py @@ -43,7 +43,8 @@ class DeferredDeleteController(wsgi.Controller): try: self.compute_api.restore(context, instance) except exception.QuotaError as error: - raise exc.HTTPRequestEntityTooLarge(explanation=unicode(error), + raise webob.exc.HTTPRequestEntityTooLarge( + explanation=unicode(error), headers={'Retry-After': 0}) except exception.InstanceInvalidState as state_error: common.raise_http_conflict_for_instance_invalid_state(state_error, |