Liron Aravot has uploaded a new change for review. Change subject: core: remove head leftover from AuditLogMessages ......................................................................
core: remove head leftover from AuditLogMessages Change-Id: I0a3da0dcacee4bf033db17472785cab09dd28500 Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/10872/1 diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties index 9e4c247..59ab260 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -433,7 +433,6 @@ NETWORK_ACTIVATE_VM_INTERFACE_FAILURE=Failed to activate Network Interface ${InterfaceName} (${InterfaceType}) for VM ${VmName}. (User: ${UserName}) NETWORK_DEACTIVATE_VM_INTERFACE_SUCCESS=Network Interface ${InterfaceName} (${InterfaceType}) deactivated for VM ${VmName}. (User: ${UserName}) NETWORK_DEACTIVATE_VM_INTERFACE_FAILURE=Failed to deactivate Network Interface ${InterfaceName} (${InterfaceType}) for VM ${VmName}. (User: ${UserName}) -<<<<<<< HEAD NETWORK_UPDTAE_NETWORK_ON_CLUSTER=Network ${NetworkName} on Cluster ${VdsGroupName} updated. NETWORK_UPDTAE_NETWORK_ON_CLUSTER_FAILED=Failed to update Network ${NetworkName} on Cluster ${VdsGroupName}. NETWORK_REMOVE_NETWORK=Network ${NetworkName} was removed from Data Center: ${StoragePoolName} -- To view, visit http://gerrit.ovirt.org/10872 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a3da0dcacee4bf033db17472785cab09dd28500 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
