← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtinst/quantal-proposed

« back to all changes in this revision

Viewing changes to tests/clone-xml/cross-pool-out.xml

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-07-24 08:52:01 UTC
  • mfrom: (1.6.8 sid)
  • Revision ID: package-import@ubuntu.com-20120724085201-q3h0cbabg4t46gfm
Tags: 0.600.2-1ubuntu1
* Merge from debian unstable. Remaining changes:
  - debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch: adjust
    testsuite for 0001-fix-path-to-hvmloader.patch and
    0002-Fix-path-to-pygrub.patch.
  - debian/patches/9004_ubuntu_fix_tree_support.patch: Fix tree detection
    for all ISO/HTTP source, to not longer fail with cobbler/koan.
  - debian/patches/0004-Fix-path-to-qemu-dm.patch: fix the path to the
    qemu-dm binary.
  - debian/{control,rules,pyversions}: Build using dh_python2, use
    debhelper v8 instead of cdbs; for some reason the package build an
    empty binary package when using dh_python2.
  - debian/control: added acl package to depends.
  - debian/control: added libvirt-bin to recommends
* Dropped patches:
  - debian/patches/9005_ubuntu_releases.patch: Upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/clone-xml/cross-pool-out.xml
26
26
      <source file="/cross-pool/new2.img"/>
27
27
    </disk>
28
28
    <interface type="network">
29
 
      <mac address="01:23:45:67:89:00"/>
 
29
      <mac address="22:23:45:67:89:00"/>
30
30
      <source network="test1"/>
31
31
    </interface>
32
32
    <interface type="network">
33
 
      <mac address="01:23:45:67:89:01"/>
 
33
      <mac address="22:23:45:67:89:01"/>
34
34
      <source network="test2"/>
35
35
    </interface>
36
36
    <input type="mouse" bus="ps2"/>