Tal Nisan has submitted this change and it was merged. Change subject: core: Fix Storage allocation validation for live merge ...................................................................... core: Fix Storage allocation validation for live merge Currently, same storage allocation validation is used both for cold merge and live merge. However, while for cold merge we check allocation for disks and their child snapshots, for live merge we only want to check allocation for disks. This patch fixes the validation accordingly. Change-Id: I7312f35a536ee8999a1ac73f84f7144e8a2fefa2 Bug-Url: https://bugzilla.redhat.com/1318050 Signed-off-by: Vered Volansky <vvolansk@redhat.com> Signed-off-by: Ala Hino <ahino@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandTest.java 2 files changed, 6 insertions(+), 3 deletions(-) Approvals: Jenkins CI: Passed CI tests Allon Mureinik: Looks good to me, approved Ala Hino: Verified -- To view, visit https://gerrit.ovirt.org/57002 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7312f35a536ee8999a1ac73f84f7144e8a2fefa2 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6.6 Gerrit-Owner: Ala Hino <ahino@redhat.com> Gerrit-Reviewer: Ala Hino <ahino@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com>