Allon Mureinik has uploaded a new change for review. Change subject: core: Fix typos in Gluster geo-replication ......................................................................
core: Fix typos in Gluster geo-replication Fixed typos: - brocker -> broker - inetrevene -> intervene Change-Id: I426d42c9c24e106aa482768d8e2a187ee5d4ae06 Bug-Url: https://bugzilla.redhat.com/1220401 Signed-off-by: Allon Mureinik <amure...@redhat.com> --- M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties M backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/40856/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 3dcb71a..a2a5734 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -764,7 +764,7 @@ GLUSTER_GEOREP_PUBLIC_KEY_WRITE_FAILED=Failed to write public keys to ${VdsName} GLUSTER_WRITE_PUB_KEYS=Public keys written to ${VdsName} GLUSTER_GEOREP_SETUP_MOUNT_BROKER_FAILED=Failed to setup geo-replication mount broker for user ${geoRepUserName} group ${geoRepGroupName} on the slave volume ${geoRepSlaveVolumeName}. -GLUSTER_SETUP_GEOREP_MOUNT_BROKER=Geo-replication mount brocker has been setup for user ${geoRepUserName} group ${geoRepGroupName} on the slave volume ${geoRepSlaveVolumeName}. +GLUSTER_SETUP_GEOREP_MOUNT_BROKER=Geo-replication mount broker has been setup for user ${geoRepUserName} group ${geoRepGroupName} on the slave volume ${geoRepSlaveVolumeName}. GLUSTER_GEOREP_SESSION_CREATE_FAILED=Failed to create geo-replication session between master volume : ${glusterVolumeName} and slave volume : ${geoRepSlaveVolumeName} for the user ${geoRepUserName}. CREATE_GLUSTER_VOLUME_GEOREP_SESSION=Created geo-replication session between master volume : ${glusterVolumeName} and slave volume : ${geoRepSlaveVolumeName} for the user ${geoRepUserName}. GLUSTER_VOLUME_GEO_REP_RESUME=Geo-replication session on volume ${glusterVolumeName} has been resumed. diff --git a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties index 4cb9976..8ae3c47 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties @@ -297,8 +297,8 @@ ResourceReferenceInvalid=Cannot perform operation. This resource has been released or expired ResourceAcqusitionFailed=Could not acquire resource. Probably resource factory threw an exception NoUpServerFoundInSlaveCluster=Cannot perform volume snapshot operation. No up server found in slave cluster of geo-replication session -FailedToStopMasterVolumeDuringVolumeSnapshotRestore=Failed to stop the master volume while restoring the snapshot, whereas slave volume(s) are restored to older state. Admin should manually inetrevene and set the stime in master to proper value and resume the geo-replication session -FailedToRestoreMasterVolumeDuringVolumeSnapshotRestore=Failed to restore the master volume, whereas slave volume(s) are restored to older state. Admin should manually inetrevene and set the stime in master to proper value and resume the geo-replication session +FailedToStopMasterVolumeDuringVolumeSnapshotRestore=Failed to stop the master volume while restoring the snapshot, whereas slave volume(s) are restored to older state. Admin should manually intervene and set the stime in master to proper value and resume the geo-replication session +FailedToRestoreMasterVolumeDuringVolumeSnapshotRestore=Failed to restore the master volume, whereas slave volume(s) are restored to older state. Admin should manually intervene and set the stime in master to proper value and resume the geo-replication session ENGINE_ERROR_CREATING_STORAGE_POOL=Cannot create Storage Pool, please check all hosts can connect to the storage domains. unavail=Resource unavailable FAILED_CHANGE_CD_IS_MOUNTED=Failed to perform "Change CD" operation, CD might be still in use by the VM.\nPlease try to manually detach the CD from withing the VM:\n 1. Log in to the VM\n 2 For Linux VMs, un-mount the CD using umount command;\n For Windows VMs, right click on the CD drive and click 'Eject'; 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 be97a75..6d04dfc 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 @@ -233,7 +233,7 @@ AuditLogType___GLUSTER_GEOREP_PUBLIC_KEY_WRITE_FAILED=Failed to write public keys AuditLogType___GLUSTER_WRITE_PUB_KEYS=Public keys written AuditLogType___GLUSTER_GEOREP_SETUP_MOUNT_BROKER_FAILED=Failed to setup geo-replication mount broker for user ${geoRepUserName} group ${geoRepGroupName} on the slave volume ${geoRepSlaveVolumeName}. -AuditLogType___GLUSTER_SETUP_GEOREP_MOUNT_BROKER=Geo-replication mount brocker has been setup +AuditLogType___GLUSTER_SETUP_GEOREP_MOUNT_BROKER=Geo-replication mount broker has been setup AuditLogType___GLUSTER_GEOREP_SESSION_CREATE_FAILED=Failed to create geo-replication session AuditLogType___CREATE_GLUSTER_VOLUME_GEOREP_SESSION=Created geo-replication session AuditLogType___GEOREP_SESSION_STOP=Geo-replication session stopped on volume diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties index 49a4c75..af21e78 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties @@ -286,8 +286,8 @@ ResourceReferenceInvalid=Cannot perform operation. This resource has been released or expired ResourceAcqusitionFailed=Could not acquire resource. Probably resource factory threw an exception NoUpServerFoundInSlaveCluster=Cannot perform volume snapshot operation. No up server found in slave cluster of geo-replication session -FailedToStopMasterVolumeDuringVolumeSnapshotRestore=Failed to stop the master volume while restoring the snapshot, whereas slave volume(s) are restored to older state. Admin should manually inetrevene and set the stime in master to proper value and resume the geo-replication session -FailedToRestoreMasterVolumeDuringVolumeSnapshotRestore=Failed to restore the master volume, whereas slave volume(s) are restored to older state. Admin should manually inetrevene and set the stime in master to proper value and resume the geo-replication session +FailedToStopMasterVolumeDuringVolumeSnapshotRestore=Failed to stop the master volume while restoring the snapshot, whereas slave volume(s) are restored to older state. Admin should manually intervene and set the stime in master to proper value and resume the geo-replication session +FailedToRestoreMasterVolumeDuringVolumeSnapshotRestore=Failed to restore the master volume, whereas slave volume(s) are restored to older state. Admin should manually intervene and set the stime in master to proper value and resume the geo-replication session ENGINE_ERROR_CREATING_STORAGE_POOL=Cannot create Storage Pool, please check all hosts can connect to the storage domains. unavail=Resource unavailable FAILED_CHANGE_CD_IS_MOUNTED=Failed to perform "Change CD" operation, CD might be still in use by the VM.\nPlease try to manually detach the CD from withing the VM:\n 1. Log in to the VM\n 2 For Linux VMs, un-mount the CD using umount command;\n For Windows VMs, right click on the CD drive and click 'Eject'; -- To view, visit https://gerrit.ovirt.org/40856 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I426d42c9c24e106aa482768d8e2a187ee5d4ae06 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amure...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
