openstack/nova
Code Issues Proposed changes

remerge trunk (again). fix issues caused by changes to deserialization calls on controllers.

Browse Source
This commit is contained in:
Monsyne Dragon
2011-03-11 19:49:32 +00:00
parent 7e95a65cce 7ca1669603
commit c91fc7c44c
69 changed files with 2779 additions and 954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/openstack/accounts.py
View File

@@ -74,7 +74,7 @@ class Controller(wsgi.Controller):
def update(self, req, id):
"""This is really create or update."""
self._check_admin(req.environ['nova.context'])
env = self._deserialize(req.body, req)
env = self._deserialize(req.body, req.get_content_type())
description = env['account'].get('description')
manager = env['account'].get('manager')
try: