Omer Frenkel has submitted this change and it was merged. Change subject: gluster: Resolve conflict for gluster hook content ......................................................................
gluster: Resolve conflict for gluster hook content While resolving content conflict in gluster hook and user chooses the hook content from one of the server, the hook should be copied on all servers - not just conflicting servers. Change-Id: Ifc2d8ad65af2e019eda0d24b6b1f2f87561c8f73 Bug-Url: https://bugzilla.redhat.com/973137 Signed-off-by: Sahina Bose <sab...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddGlusterHookCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommand.java 3 files changed, 37 insertions(+), 12 deletions(-) Approvals: Sahina Bose: Verified Omer Frenkel: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/15717 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc2d8ad65af2e019eda0d24b6b1f2f87561c8f73 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sahina Bose <sab...@redhat.com> Gerrit-Reviewer: Kanagaraj M <kmayi...@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofren...@redhat.com> Gerrit-Reviewer: Sahina Bose <sab...@redhat.com> Gerrit-Reviewer: Shubhendu Tripathi <shtri...@redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
