← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtinst/quantal-updates

« back to all changes in this revision

Viewing changes to tests/xmlparse-xml/change-guest-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/xmlparse-xml/change-guest-out.xml
51
51
    </disk>
52
52
    <interface type="network">
53
53
      <source network="default"/>
54
 
      <mac address="11:22:33:44:55:66"/>
 
54
      <mac address="22:22:33:44:55:66"/>
55
55
      <model type="virtio"/>
56
56
    </interface>
57
57
    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
58
58
    <console type="pty"/>
 
59
    <memballoon model="none"/>
59
60
  </devices>
60
61
  <seclabel type="static" model="apparmor">
61
62
    <label>barlabel</label>
62
63
    <imagelabel>fooimage</imagelabel>
63
64
  </seclabel>
64
 
  <description>Hey desc changed</description>
 
65
  <description>Hey desc changed&amp;</description>
65
66
  <memoryBacking>
66
67
    <hugepages/>
67
68
  </memoryBacking>