Change in ovirt-engine[master]: core: Fix error message for locked disks

Tal Nisan has submitted this change and it was merged. Change subject: core: Fix error message for locked disks ...................................................................... core: Fix error message for locked disks This fix is related to bug Bug-Url: https://bugzilla.redhat.com/865551 , though not specifically mentioned there. It fixes an error message displayed when trying to run a VM while one or more of its disks are locked. Previous message's disks_aliases was not substituted with actual disks aliases. The same issue occurred with MoveOrCopyDiskCommand. There were two separate messages for the one locked disk and multiple locked disks. Now one message replaces the two previous ones, along with the correct disk(s) alias(es). Change-Id: I7c56d9d2926eaf34b4a279c8d61a8cb166524da9 Signed-off-by: Vered Volansky <vvolansk(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 11 files changed, 56 insertions(+), 24 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Vered Volansky: Verified -- To view, visit http://gerrit.ovirt.org/8693 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c56d9d2926eaf34b4a279c8d61a8cb166524da9 Gerrit-PatchSet: 14 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvolansk(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com&gt; Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com&gt; Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com&gt; Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com&gt; Gerrit-Reviewer: Sharad Mishra <snmishra(a)linux.vnet.ibm.com&gt; Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt; Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com&gt;