Michael Kublin has submitted this change and it was merged. Change subject: core: canDoAction msg of locked disk being removed ...................................................................... core: canDoAction msg of locked disk being removed Change the can-do-action message which is attached to locks that are taken when removing disk in order to make it more informative than the default generic message that is being returned when those locks can't be acquired. This change of the can-do-action message allows us not to pass the locks from RemoveDiskCommand to RemoveImageCommand - as those locks can remain until the end of the execution of RemoveDiskCommand, there's no hurry to free them anymore. Change-Id: Ib20a2be29d01c04497473d168e7abbe7d1bf2db8 Signed-off-by: Arik Hadas <ahadas@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.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 7 files changed, 25 insertions(+), 9 deletions(-) Approvals: Michael Kublin: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/13009 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib20a2be29d01c04497473d168e7abbe7d1bf2db8 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Michael Kublin <mkublin@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel@redhat.com>