← Back to branch summary

~cerberus/nova/disk_config

« back to all changes in this revision

Viewing changes to nova/api/openstack/images.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/images.py
251
251
            elem = etree.SubElement(image_elem,
252
252
                                    '{%s}link' % xmlutil.XMLNS_ATOM)
253
253
            elem.set('rel', link['rel'])
 
254
            if 'type' in link:
 
255
                elem.set('type', link['type'])
254
256
            elem.set('href', link['href'])
255
257
        return image_elem
256
258