Shubhendu Tripathi has uploaded a new change for review. Change subject: gluster: Corrected conflict in LocalizedEnums ......................................................................
gluster: Corrected conflict in LocalizedEnums There was a conflict in LocalizedEnums.properties. Corrected the same. Change-Id: I82f0dc0351e58b951a5e56db0b73aaa1acaa81bd Signed-off-by: Shubhendu Tripathi <[email protected]> --- M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/16364/1 diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties index cd9a25e..35cef8f 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties @@ -289,11 +289,8 @@ VdcActionType___UpdateGlusterHook=Update Gluster Hook VdcActionType___AddGlusterHook=Add Gluster Hook VdcActionType___RemoveGlusterHook=Remove Gluster Hook -<<<<<<< HEAD VdcActionType___RefreshGlusterHook=Refresh Gluster Hook -======= VdcActionType___ManageGlusterService=Manage Service ->>>>>>> gluster: bll command to start/stop/restart service VdcActionType___ActivateStorageDomain=Activate Storage Domain VdcActionType___FenceVdsManualy=Fence Host Manually VdcActionType___AddEmptyStoragePool=New Data Center -- To view, visit http://gerrit.ovirt.org/16364 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82f0dc0351e58b951a5e56db0b73aaa1acaa81bd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shubhendu Tripathi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
