From Liron Aravot <laravot@redhat.com>:

Liron Aravot has submitted this change and it was merged. Change subject: Cold Merge: Finalize merge step ...................................................................... Cold Merge: Finalize merge step Finalize will update qemu chain and vdsm chain to reflect the new chain after the merge. This operation must be run on the SPM. Change-Id: I52b218bc4ae4016616ed9a197a6b0602a3bdc8b8 Bug-Url: https://bugzilla.redhat.com/1246114 Signed-off-by: Ala Hino <ahino@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/ColdMergeSnapshotSingleDiskCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/FinalizeMergeCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/MergeSPMBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/PrepareMergeCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/AsyncTaskType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/StepEnum.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java M backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FinalizeMergeVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java 12 files changed, 130 insertions(+), 30 deletions(-) Approvals: Daniel Erez: Looks good to me, approved Ala Hino: Verified Liron Aravot: Looks good to me, but someone else must approve; Passed CI tests -- To view, visit https://gerrit.ovirt.org/67250 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52b218bc4ae4016616ed9a197a6b0602a3bdc8b8 Gerrit-PatchSet: 28 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ala Hino <ahino@redhat.com> Gerrit-Reviewer: Ala Hino <ahino@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Daniel Erez <derez@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>