Kanagaraj M has submitted this change and it was merged. Change subject: webadmin: fix displaying binary gluster hook ...................................................................... webadmin: fix displaying binary gluster hook When resolving a conflict on a hook with differet content types in different servers, the binary content is getting displayed. This now fixed by adding content type check before trying to fetch the content from backend. Fixed typo in getGlusterHookEntity(). Change-Id: Ia189162dc339bab135979b4801c964112b24df18 Bug-Url: https://bugzilla.redhat.com/973091 Signed-off-by: Kanagaraj M <kmayilsa@redhat.com> --- 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/GlusterHookResolveConflictsModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.java 3 files changed, 22 insertions(+), 31 deletions(-) Approvals: Kanagaraj M: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/15704 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia189162dc339bab135979b4801c964112b24df18 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <kmayilsa@redhat.com> Gerrit-Reviewer: Gilad Chaplik <gchaplik@redhat.com> Gerrit-Reviewer: Kanagaraj M <kmayilsa@redhat.com> Gerrit-Reviewer: Sahina Bose <sabose@redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server