diff options
| author |   Tim Rozet <trozet@redhat.com> | 2015-09-08 14:57:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-08 14:57:39 +0000 |
| commit | e65ed372ee84b1f634ec24002fb7bfd7d48fd7e7 (patch) | |
| tree | b56c3f4dae40c8efab7ddf177c7ae9475d7cf16e /fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master | |
| parent | 7f8c963b4dbcc1e57e97e2637ad5a639594319fa (diff) | |
| parent | 8f49d7a5efc0e847ecffcb05f6aff2186d8cecc9 (diff) | |
Merge "Merge branch 'master' into merge-master-arno" into stable/arno
Diffstat (limited to 'fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master')
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master index 9ff8017..d2a7841 100644 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master +++ b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master @@ -98,6 +98,5 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </memballoon> </devices> - <seclabel type='dynamic' model='apparmor' relabel='yes'/> </domain> |