Change in ovirt-engine[master]: Cold Merge: Prepare merge step

Liron Aravot has submitted this change and it was merged. Change subject: Cold Merge: Prepare merge step ...................................................................... Cold Merge: Prepare merge step Prepare merge will calculate the required allocation for base volume, extend the base volume and mark it as ILLEGAL. This operation must be run on the SPM. Change-Id: Ie243283550ef527392bb8e575ba8a2562a627dae Bug-Url: https://bugzilla.redhat.com/1246114 Signed-off-by: Ala Hino <ahino(a)redhat.com&gt; --- 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/PrepareMergeCommand.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ColdMergeCommandParameters.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 A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SubchainInfo.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/StepEnum.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SubchainInfoHelper.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMColdMergeVDSCommandParameters.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 M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/PrepareMergeVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml 15 files changed, 248 insertions(+), 1 deletion(-) Approvals: Ala Hino: Verified Liron Aravot: Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/67249 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie243283550ef527392bb8e575ba8a2562a627dae Gerrit-PatchSet: 22 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ala Hino <ahino(a)redhat.com&gt; Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com&gt; Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;