Oved Ourfali has submitted this change and it was merged. Change subject: core: Enable Live Merge in Snapshots Overview ...................................................................... core: Enable Live Merge in Snapshots Overview Enable Live Merge in the snapshots overview. This required enabling the action in CanDoAction using code similar to RemoveSnapshotCommand, and branching RemoveDiskSnapshotsCommand to use CoCo in executing the Live Merge rather than task handlers for cold merge. The task handlers for cold merge are initialized early in the command lifecycle, before the command knows if the VM is up. Therefore, a means of disabling these handlers is provided so that once the command can determine a Live Merge is occurring, it can disable the handlers and rely on command coordination for the merge execution. Change-Id: I30d152a70ebdeacf0410d7ad15a49e44fb564a18 Bug-Url: https://bugzilla.redhat.com/1133890 Signed-off-by: Greg Padgett <gpadgett(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotsCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotsCommandCallback.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveDiskSnapshotsCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveDiskSnapshotsParameters.java 6 files changed, 295 insertions(+), 10 deletions(-) Approvals: Greg Padgett: Verified Daniel Erez: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/36001 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I30d152a70ebdeacf0410d7ad15a49e44fb564a18 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Greg Padgett <gpadgett(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Greg Padgett <gpadgett(a)redhat.com&gt; Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com&gt; Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server