Roy Golan has submitted this change and it was merged. Change subject: core: Use the cluster emulated machine to run a VM ...................................................................... core: Use the cluster emulated machine to run a VM According to http://www.ovirt.org/Cluster_emulation_modes#Run%20VM Instead of a global config value, use the cluster emulated machine field. Deleted the deprecated emulatedMachine Config value Bug-Url: https://bugzilla.redhat.com/927874 Change-Id: I23736fcc1748e47ce82b84d5167c18dc370bd3ad Signed-off-by: Roy Golan <rgolan@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql M packaging/etc/engine-config/engine-config.properties 4 files changed, 6 insertions(+), 12 deletions(-) Approvals: Roy Golan: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/15910 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I23736fcc1748e47ce82b84d5167c18dc370bd3ad Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <rgolan@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel@redhat.com> Gerrit-Reviewer: Roy Golan <rgolan@redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server