← Back to branch summary

~0x44/nova/extdoc

« back to all changes in this revision

Viewing changes to nova/virt/disk.py

  • Committer: Brian Waldon
  • Date: 2011-09-12 21:52:29 UTC
  • mfrom: (1558 nova)
  • mto: This revision was merged to the branch mainline in revision 1561.
  • Revision ID: brian.waldon@rackspace.com-20110912215229-5xab1wvvd11rft6g
merging trunk; resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/disk.py
160
160
    except Exception, exn:
161
161
        LOG.exception(_('Failed to remove container: %s'), exn)
162
162
 
 
163
 
163
164
def _link_device(image, nbd):
164
165
    """Link image to device using loopback or nbd"""
165
166