Kanagaraj M has submitted this change and it was merged. Change subject: webadmin: Gluster Hooks - conflict resolution popup ...................................................................... webadmin: Gluster Hooks - conflict resolution popup New Action 'Resolve Conflicts' is added to gluster hooks tab. This action will be enabled if the hook is not in sync in the hosts of the cluster and engine. Engine copy of the hook will be considered as a Master copy. On clicking 'Resolve Conflicts', a popup will be shown explaining the reason for the conflict. The conflict could be any one/mutiple of the following 1.MISMATCH IN CONTENT - hook content is different across hosts 2.MISMATCH IN STATUS - hook status is different across hosts 3.MISSING HOOK - hook is not present in some hosts The user will be able to view the content and status of the hook from different sources (hosts and Engine). Finally the user can select the resole actions which will resolve the conflicts. Change-Id: I10bc9c7dba7cb1be320bb0e12f3b7bf7a8beb485 Signed-off-by: Kanagaraj M <kmayilsa(a)redhat.com&gt; --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGlusterHookListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/GlusterHookContentModel.java A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/GlusterHookResolveConflictsModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/ClusterModule.java A frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/cluster/GlusterHookResolveConflictsPopupPresenterWidget.java A frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.java A frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGlusterHookView.java 12 files changed, 1,055 insertions(+), 6 deletions(-) Approvals: Kanagaraj M: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/11839 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I10bc9c7dba7cb1be320bb0e12f3b7bf7a8beb485 Gerrit-PatchSet: 15 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <kmayilsa(a)redhat.com&gt; Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com&gt; Gerrit-Reviewer: Kanagaraj M <kmayilsa(a)redhat.com&gt; Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com&gt;