diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-23 16:44:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-23 16:44:34 +0000 |
| commit | 3bbf3b055818ee5ad2d36239288115bb803ac5e8 (patch) | |
| tree | 614bc01d1130daeef5d9010f9a49b694767db579 /nova/api | |
| parent | 4f9a143712bb0df7227be4c66b0982a3c42e4408 (diff) | |
| parent | 3228cac0d1bc42681e82e90dc92b691af09f0fad (diff) | |
| download | nova-3bbf3b055818ee5ad2d36239288115bb803ac5e8.tar.gz nova-3bbf3b055818ee5ad2d36239288115bb803ac5e8.tar.xz nova-3bbf3b055818ee5ad2d36239288115bb803ac5e8.zip | |
Merge "Remove ImageTooLarge exception"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 0816e0a61..cec7cbd60 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -925,7 +925,6 @@ class Controller(wsgi.Controller): msg = "UnicodeError: %s" % unicode(error) raise exc.HTTPBadRequest(explanation=msg) except (exception.ImageNotActive, - exception.ImageTooLarge, exception.InstanceTypeDiskTooSmall, exception.InstanceTypeMemoryTooSmall, exception.InstanceTypeNotFound, @@ -1286,7 +1285,6 @@ class Controller(wsgi.Controller): msg = _("Cannot find image for rebuild") raise exc.HTTPBadRequest(explanation=msg) except (exception.ImageNotActive, - exception.ImageTooLarge, exception.InstanceTypeDiskTooSmall, exception.InstanceTypeMemoryTooSmall, exception.InvalidMetadata) as error: |