Shahar Havivi has uploaded a new change for review. Change subject: webadmin: Typo in tasks tab of webadmin (#863294) ......................................................................
webadmin: Typo in tasks tab of webadmin (#863294) text change 'till' to 'until' https://bugzilla.redhat.com/863294 Change-Id: I97390702b216e52699fd240543deca74ec5ce793 Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/conf/ca/SignReq.sh M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java M backend/manager/tools/engine-notifier/engine-notifier-service/src/test/java/org/ovirt/engine/core/notifier/NotificationServiceTest.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/TasksTree.java 5 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/8391/1 diff --git a/backend/manager/conf/ca/SignReq.sh b/backend/manager/conf/ca/SignReq.sh index 39e90d6..c58ce6f 100755 --- a/backend/manager/conf/ca/SignReq.sh +++ b/backend/manager/conf/ca/SignReq.sh @@ -12,7 +12,7 @@ printf "Where:\n" printf "\tRequest Filename = Filename of request file. must reside under requests directory.\n" printf "\tOutput certificate filename = Filename of output file. will reside under certs directory.\n" - printf "\tdays to expire = Amount of days till certificate expires.\n" + printf "\tdays to expire = Amount of days until certificate expires.\n" printf "\tCA Directory = Full path to CA directory\n" printf "\tstartdate = in YYMMDDHHMMSSZ ANS1 format\n" printf "\tPass = Certificate password\n" diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java index ab5566e..c5e270f 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java @@ -62,7 +62,7 @@ CASE_SENSITIVE_CONSTRAINT_PARAMETER, FROM_CONSTRAINT_PARAMETER); - //preserved in sake if backward compatibility till 4.0 + //preserved in sake if backward compatibility until 4.0 HashMap<String, String> queryConstraints = QueryHelper.getQueryConstraints(getUriInfo(), FROM_CONSTRAINT_PARAMETER); @@ -73,7 +73,7 @@ LOG.error("Unwrapping of '"+FROM_CONSTRAINT_PARAMETER+"' matrix search parameter failed.", ex); } } else if (queryConstraints.containsKey(FROM_CONSTRAINT_PARAMETER)) { - //preserved in sake if backward compatibility till 4.0 + //preserved in sake if backward compatibility until 4.0 try { searchParams.setSearchFrom(Long.parseLong(queryConstraints.get(FROM_CONSTRAINT_PARAMETER))); } catch (Exception ex) { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index c63e0ce..6206b09 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -1430,7 +1430,7 @@ * inMigration */ log.infoFormat( - "vds::refreshVmList vm id '{0}' is migrating to vds '{1}' ignoring it in the refresh till migration is done", + "vds::refreshVmList vm id '{0}' is migrating to vds '{1}' ignoring it in the refresh until migration is done", runningVm.getId(), _vds.getvds_name()); returnValue = true; @@ -1440,7 +1440,7 @@ if (vmDynamic != null && vmDynamic.getrun_on_vds() != null && !vmDynamic.getrun_on_vds().equals(_vds.getId()) && runningVm.getstatus() != VMStatus.Up) { log.infoFormat( - "vds::refreshVmList vm id '{0}' status = {1} on vds {2} ignoring it in the refresh till migration is done", + "vds::refreshVmList vm id '{0}' status = {1} on vds {2} ignoring it in the refresh until migration is done", runningVm.getId(), runningVm.getstatus(), _vds.getvds_name()); diff --git a/backend/manager/tools/engine-notifier/engine-notifier-service/src/test/java/org/ovirt/engine/core/notifier/NotificationServiceTest.java b/backend/manager/tools/engine-notifier/engine-notifier-service/src/test/java/org/ovirt/engine/core/notifier/NotificationServiceTest.java index 1709981..838f766 100644 --- a/backend/manager/tools/engine-notifier/engine-notifier-service/src/test/java/org/ovirt/engine/core/notifier/NotificationServiceTest.java +++ b/backend/manager/tools/engine-notifier/engine-notifier-service/src/test/java/org/ovirt/engine/core/notifier/NotificationServiceTest.java @@ -11,7 +11,7 @@ public class NotificationServiceTest { /** - * The test executes a notifications for events which haven't been processed till the start of the test.<br> + * The test executes a notifications for events which haven't been processed until the start of the test.<br> * Once those events are notified to the subscribers, they will be marked as processed and won't be send again<br> * The test covers the the entire functional of the event notification service:<br> * <li>Retrieval of events to be processed diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/TasksTree.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/TasksTree.java index c3843e9..5410b32 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/TasksTree.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/TasksTree.java @@ -39,7 +39,7 @@ addItemToPanel(panel, new Image(getStatusImage(task.getStatus())), "25px"); //$NON-NLS-1$ addTextBoxToPanel(panel, new TextBoxLabel(), task.getDescription(), ""); //$NON-NLS-1$ addValueLabelToPanel(panel, new FullDateTimeLabel(), task.getStartTime(), "150px"); //$NON-NLS-1$ - addTextBoxToPanel(panel, new TextBoxLabel(), task.getEndTime() == null ? "" : "till", "40px"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + addTextBoxToPanel(panel, new TextBoxLabel(), task.getEndTime() == null ? "" : "until", "40px"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addValueLabelToPanel(panel, new FullDateTimeLabel(), task.getEndTime(), "150px"); //$NON-NLS-1$ TextBoxLabel corrIdTextBoxLabel = new TextBoxLabel(); corrIdTextBoxLabel.setTooltipCaption(constants.correltaionIdEvent()); -- To view, visit http://gerrit.ovirt.org/8391 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I97390702b216e52699fd240543deca74ec5ce793 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
