Change in ovirt-engine[master]: merge: fix incorrect condition in getRequiredSizeForMerge

Allon Mureinik has submitted this change and it was merged. Change subject: merge: fix incorrect condition in getRequiredSizeForMerge ...................................................................... merge: fix incorrect condition in getRequiredSizeForMerge The assignment of volumeType from commit 12629c667a2efed513519a751a4da295b7b2dad0 is incorrect and unnecessary, since the swap between top and base is only relevant for the old cold merge (pre-4.1) which when performed won't execute those line anyway, and this will make volumeType always VolumeType.SPARSE. Change-Id: I7ff90f90bb8af12e9e6191b825c70f2f6a907f38 Signed-off-by: Benny Zlotnik <bzlotnik(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/storage/StorageDomainValidator.java 1 file changed, 5 insertions(+), 7 deletions(-) Approvals: Benny Zlotnik: Verified Jenkins CI: Passed CI tests Allon Mureinik: Looks good to me, approved Ala Hino: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/76638 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ff90f90bb8af12e9e6191b825c70f2f6a907f38 Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Benny Zlotnik <bzlotnik(a)redhat.com&gt; Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Benny Zlotnik <bzlotnik(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;