diff options
| author | Alex Meade <alex.meade@rackspace.com> | 2011-08-02 15:43:36 -0400 |
|---|---|---|
| committer | Alex Meade <alex.meade@rackspace.com> | 2011-08-02 15:43:36 -0400 |
| commit | ded9447aca01d593b0efa91b5ec23ecf8aa97264 (patch) | |
| tree | bdc027b193b070569a59a736b16524b79057160b | |
| parent | a7e4142adea48e230f9111990485866b0ff0073a (diff) | |
| download | nova-ded9447aca01d593b0efa91b5ec23ecf8aa97264.tar.gz nova-ded9447aca01d593b0efa91b5ec23ecf8aa97264.tar.xz nova-ded9447aca01d593b0efa91b5ec23ecf8aa97264.zip | |
Fixed merge issues
| -rw-r--r-- | nova/api/openstack/images.py | 3 | ||||
| -rw-r--r-- | nova/api/openstack/servers.py | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py index 43d976b8f..0834adfa5 100644 --- a/nova/api/openstack/images.py +++ b/nova/api/openstack/images.py @@ -197,9 +197,6 @@ class ControllerV11(Controller): def create(self, *args, **kwargs): raise webob.exc.HTTPMethodNotAllowed() - def create(self, *args, **kwargs): - raise webob.exc.HTTPMethodNotAllowed() - class ImageXMLSerializer(wsgi.XMLDictSerializer): diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index dfa150320..7b757143d 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -20,7 +20,6 @@ import traceback from webob import exc from xml.dom import minidom import webob -from xml.dom import minidom from nova import compute from nova import exception @@ -178,6 +177,7 @@ class Controller(object): for key in self.actions.keys(): if key in body: return self.actions[key](body, req, id) + raise exc.HTTPNotImplemented() def _action_create_backup(self, input_dict, req, instance_id): |