← Back to branch summary

~cerberus/nova/disk_config

« back to all changes in this revision

Viewing changes to nova/api/openstack/contrib/diskconfig.py

  • Committer: matt.dietz at rackspace
  • Date: 2011-09-21 19:48:25 UTC
  • mfrom: (1511.1.98 nova)
  • Revision ID: matt.dietz@rackspace.com-20110921194825-zv1w4qonfh6o1j2u
Merge from trunk, updated failing tests and pep8

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/contrib/diskconfig.py
74
74
                nova.image.get_default_image_service()
75
75
 
76
76
    def _return_dict(self, image_id, managed_disk):
77
 
        return {'image': {'id': image_id, 
 
77
        return {'image': {'id': image_id,
78
78
                'managed_disk': managed_disk}}
79
79
 
80
80
    def index(self, req, image_id):