Allon Mureinik has uploaded a new change for review.
Change subject: core: Grammar fix
......................................................................
core: Grammar fix
Fixed the common mistake of using "more then" instead of "more than"
throughout the codebsae.
Change-Id: Idd4bba75e08bf89ce4bac5672c710ba313192f91
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDAOTest.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
M packaging/dbscripts/create_functions.sql
9 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/40898/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
index 0a64c8b..cd2ffcb 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
@@ -669,7 +669,7 @@
return false;
}
- // validate NUMA nodes count not more then CPUs
+ // validate NUMA nodes count not more than CPUs
if (getParameters().getVm().getMigrationSupport() ==
MigrationSupport.PINNED_TO_HOST &&
!validate(VmHandler.checkVmNumaNodesIntegrity(getParameters().getVm(),
getParameters().getVm(),
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
index acc7e7f..ba4ea73 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
@@ -1302,7 +1302,7 @@
// Iterate all over the entities , which should be affected.
for (PermissionSubject permSubject : permissionSubjects) {
if (permSubject.getObjectId() != null) {
- // Add comma when there are more then one entity
+ // Add comma when there are more than one entity
// affected.
if (builder.length() != 0) {
builder.append(", ");
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java
index f3f3242..d694c30 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java
@@ -150,7 +150,7 @@
}
/**
- * Shareable disk which shared between more then one VM, will be returned
more then once when fetching the images by image group
+ * Shareable disk which shared between more than one VM, will be returned
more than once when fetching the images by image group
* since it has multiple VM devices (one for each VM it is attached to)
and not because he has snapshots,
* so the shareable disk needs to be distinct when updating the storage
domain.
* @param snapshots - All the images which related to the image group id
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
index 9cda234..be73cef 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
@@ -76,7 +76,7 @@
}
/**
- * List on all VDSs, vm run on. In the case of problem to run vm will be
more then one
+ * List on all VDSs, vm run on. In the case of problem to run vm will be
more than one
*/
protected List<Guid> getRunVdssList() {
return runVdsList;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java
index 3503bd4..0244931 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java
@@ -280,7 +280,7 @@
List<DiskImage> diskImageList =
getDiskImageDao().getAllSnapshotsForImageGroup(getOldDisk().getId());
- // If disk image list is more then one then we assume that it has
a snapshot, since one image is the active
+ // If disk image list is more than one then we assume that it has
a snapshot, since one image is the active
// disk and all the other images are the snapshots.
if ((diskImageList.size() > 1) || !Guid.Empty.equals(((DiskImage)
getOldDisk()).getImageTemplateId())) {
return
failCanDoAction(VdcBllMessages.SHAREABLE_DISK_IS_NOT_SUPPORTED_FOR_DISK);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java
index 29904a8..397abe0 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java
@@ -130,7 +130,7 @@
return
failCanDoAction(VdcBllMessages.VM_PINNING_VCPU_DOES_NOT_EXIST);
}
if (!vcpus.add(currVcpu)) {
- // ERROR contains more then one definition for the same vcpu
+ // ERROR contains more than one definition for the same vcpu
return
failCanDoAction(VdcBllMessages.VM_PINNING_DUPLICATE_DEFINITION);
}
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDAOTest.java
index 1c2dcd3..a7d69a0 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDAOTest.java
@@ -334,7 +334,7 @@
statuses.add(vds.getStatus());
}
assertCorrectGetAllResult(result);
- assertTrue("more then one different status expected", statuses.size()
> 1);
+ assertTrue("more than one different status expected", statuses.size()
> 1);
}
private void assertGetAllForVdsGroupCorrectResult(List<VDS> result) {
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
index 2fe1333..f4ae104 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
@@ -266,7 +266,7 @@
if (!vmDevice.getIsManaged()) {
continue;
}
- // more then one device mean that we have payload and should
use it
+ // more than one device mean that we have payload and should
use it
// instead of the blank cd
if (!VmPayload.isPayload(vmDevice.getSpecParams()) &&
vmDevices.size() > 1) {
continue;
diff --git a/packaging/dbscripts/create_functions.sql
b/packaging/dbscripts/create_functions.sql
index f102974..42bdca8 100644
--- a/packaging/dbscripts/create_functions.sql
+++ b/packaging/dbscripts/create_functions.sql
@@ -519,7 +519,7 @@
else
v_result := 2;
end if;
- -- else (if return more then 1 row)
+ -- else (if return more than 1 row)
else
select count(*) INTO v_rowsCount from tt_TEMP22 where status = 3;
if (v_rowsCount > 0) then
--
To view, visit https://gerrit.ovirt.org/40898
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd4bba75e08bf89ce4bac5672c710ba313192f91
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
