Skip to content

Commit f090c77

Browse files
misc: fix spelling (#7549)
Co-authored-by: Stephan Krug <[email protected]>
1 parent 9c4d18f commit f090c77

File tree

51 files changed

+87
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+87
-87
lines changed

api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public boolean isForced() {
6464
return (forced != null) ? forced : false;
6565
}
6666

67-
public boolean isForceDestoryLocalStorage() {
67+
public boolean isForceDestroyLocalStorage() {
6868
return (forceDestroyLocalStorage != null) ? forceDestroyLocalStorage : true;
6969
}
7070

@@ -79,7 +79,7 @@ public long getEntityOwnerId() {
7979

8080
@Override
8181
public void execute() {
82-
boolean result = _resourceService.deleteHost(getId(), isForced(), isForceDestoryLocalStorage());
82+
boolean result = _resourceService.deleteHost(getId(), isForced(), isForceDestroyLocalStorage());
8383
if (result) {
8484
SuccessResponse response = new SuccessResponse(getCommandName());
8585
this.setResponseObject(response);

api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public Map<Long, List<String>> getVmIdIpListMap() {
133133
throw new InvalidParameterValueException("Unable to find virtual machine ID: " + vmId);
134134
}
135135

136-
//check wether the given ip is valid ip or not
136+
//check whether the given ip is valid ip or not
137137
if (vmIp == null || !NetUtils.isValidIp4(vmIp)) {
138138
throw new InvalidParameterValueException("Invalid ip address "+ vmIp +" passed in vmidipmap for " +
139139
"vmid " + vmId);

engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public boolean isUsingServicePackage(String uuid) {
228228
}
229229

230230
/**
231-
* Persist L2 deafult Network offering
231+
* Persist L2 default Network offering
232232
*/
233233
private void persistL2DefaultNetworkOffering(String name, String displayText, boolean specifyVlan, boolean configDriveEnabled) {
234234
NetworkOfferingVO offering = new NetworkOfferingVO(name, displayText, TrafficType.Guest, false, specifyVlan,

engine/schema/src/main/java/com/cloud/upgrade/DatabaseIntegrityChecker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private Boolean checkDuplicateHostWithTheSameLocalStorage() {
8686
boolean noDuplicate = true;
8787
StringBuffer helpInfo = new StringBuffer();
8888
String note =
89-
"DATABASE INTEGRITY ERROR\nManagement server detected there are some hosts connect to the same loacal storage, please contact CloudStack support team for solution. Below are detialed info, please attach all of them to CloudStack support. Thank you\n";
89+
"DATABASE INTEGRITY ERROR\nManagement server detected there are some hosts connect to the same local storage, please contact CloudStack support team for solution. Below are detailed info, please attach all of them to CloudStack support. Thank you\n";
9090
helpInfo.append(note);
9191
while (rs.next()) {
9292
try ( PreparedStatement sel_pstmt =

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade218to22.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,7 @@ private void updateUserStats(Connection conn) {
11681168
pstmt.executeUpdate();
11691169
s_logger.debug("Upgraded userStatistcis with device_type=DomainRouter");
11701170

1171-
// update device_id infrormation
1171+
// update device_id information
11721172
try (
11731173
PreparedStatement selectUserStatistics = conn.prepareStatement("SELECT id, account_id, data_center_id FROM user_statistics");
11741174
ResultSet rs = selectUserStatistics.executeQuery();

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade224to225.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ private void addMissingKeys(Connection conn) {
332332
pstmt.close();
333333
} catch (SQLException e) {
334334
s_logger.error("Unable to add missing foreign key; following statement was executed:" + pstmt);
335-
throw new CloudRuntimeException("Unable to add missign keys due to exception", e);
335+
throw new CloudRuntimeException("Unable to add missing keys due to exception", e);
336336
}
337337
}
338338

@@ -348,7 +348,7 @@ private void addMissingOvsAccount(Connection conn) {
348348
}
349349
} catch (SQLException e) {
350350
s_logger.error("Unable to add missing ovs tunnel account due to ", e);
351-
throw new CloudRuntimeException("Unable to add missign ovs tunnel account due to ", e);
351+
throw new CloudRuntimeException("Unable to add missing ovs tunnel account due to ", e);
352352
}
353353
}
354354
}

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade301to302.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private void dropKeysIfExists(Connection conn) {
6666
keys.add("i_host__allocation_state");
6767
uniqueKeys.put("host", keys);
6868

69-
s_logger.debug("Droping i_host__allocation_state key in host table");
69+
s_logger.debug("Dropping i_host__allocation_state key in host table");
7070
for (String tableName : uniqueKeys.keySet()) {
7171
DbUpgradeUtils.dropKeysIfExist(conn, tableName, uniqueKeys.get(tableName), false);
7272
}

engine/schema/src/main/resources/META-INF/db/schema-21to22.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (88, 6, 'W
646646
INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (89, 6, 'Windows Server 2003 Standard Edition(32-bit)');
647647
INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (90, 6, 'Windows Server 2003 Standard Edition(64-bit)');
648648
INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (91, 6, 'Windows Server 2003 Web Edition');
649-
INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (92, 6, 'Microsoft Small Bussiness Server 2003');
649+
INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (92, 6, 'Microsoft Small Business Server 2003');
650650
INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (93, 6, 'Windows XP (32-bit)');
651651
INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (94, 6, 'Windows XP (64-bit)');
652652
INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (95, 6, 'Windows 2000 Advanced Server');
@@ -779,7 +779,7 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest
779779
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Server 2003, Standard Edition (32-bit)', 89);
780780
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Server 2003, Standard Edition (64-bit)', 90);
781781
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Server 2003, Web Edition', 91);
782-
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Small Bussiness Server 2003', 92);
782+
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Small Business Server 2003', 92);
783783
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Vista (32-bit)', 56);
784784
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Vista (64-bit)', 101);
785785
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows XP Professional (32-bit)', 93);

engine/schema/src/main/resources/META-INF/db/schema-2212to2213.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,6 @@ update host_details set name='memory' where host_id in (select id from host wher
7777
update host_details set name='privateip' where host_id in (select id from host where hypervisor_type='BareMetal') and name='agentIp';
7878

7979
INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'vmware.root.disk.controller', 'ide', 'Specify the default disk controller for root volumes, valid values are scsi, ide');
80-
INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'vm.destory.forcestop', 'false', 'On destory, force-stop takes this value');
80+
INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'vm.destroy.forcestop', 'false', 'On destroy, force-stop takes this value');
8181
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.lock.timeout', '600', 'Lock wait timeout (seconds) while implementing network');
8282
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.disable.rpfilter','true','disable rp_filter on Domain Router VM public interfaces.');

engine/schema/src/main/resources/META-INF/db/schema-2214to30.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ UPDATE `cloud`.`configuration` SET category = 'Usage' where name in ('usage.exec
702702
ALTER TABLE `cloud`.`op_dc_vnet_alloc` ADD CONSTRAINT `fk_op_dc_vnet_alloc__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE;
703703
ALTER TABLE `cloud`.`domain` ADD COLUMN `type` varchar(255) NOT NULL DEFAULT 'Normal' COMMENT 'type of the domain - can be Normal or Project';
704704

705-
UPDATE `cloud`.`configuration` SET name='vm.destroy.forcestop' where name='vm.destory.forcestop';
705+
UPDATE `cloud`.`configuration` SET name='vm.destroy.forcestop' where name='vm.destroy.forcestop';
706706
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'vm.destroy.forcestop', 'false', 'On destroy, force-stop takes this value');
707707
DELETE FROM `cloud`.`configuration` where name='skip.steps';
708708

0 commit comments

Comments
 (0)