Skip to content

Commit f820d01

Browse files
committed
fix end of files and codespell errors
1 parent 2d6280b commit f820d01

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

agent/conf/agent.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,4 +472,3 @@ iscsi.session.cleanup.enabled=false
472472
# Optional vCenter SHA1 thumbprint for VMware to KVM conversion via VDDK, passed as
473473
# -io vddk-thumbprint=<value>. If unset, CloudStack computes it on the KVM host via openssl.
474474
#vddk.thumbprint=
475-

engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,3 @@ UPDATE `cloud`.`configuration`
5959
SET value = CONCAT_WS('\n', 'Hello {{username}}!', 'You have requested to reset your password. Please click the following link to reset your password:', '{{{resetLink}}}', 'If you did not request a password reset, please ignore this email.', '', 'Regards,', 'The CloudStack Team')
6060
WHERE name = 'user.password.reset.mail.template'
6161
AND value IN (CONCAT_WS('\n', 'Hello {{username}}!', 'You have requested to reset your password. Please click the following link to reset your password:', 'http://{{{resetLink}}}', 'If you did not request a password reset, please ignore this email.', '', 'Regards,', 'The CloudStack Team'), CONCAT_WS('\n', 'Hello {{username}}!', 'You have requested to reset your password. Please click the following link to reset your password:', '{{{domainUrl}}}{{{resetLink}}}', 'If you did not request a password reset, please ignore this email.', '', 'Regards,', 'The CloudStack Team'));
62-

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public Answer execute(ConvertInstanceCommand cmd, LibvirtComputingResource serve
107107
String vddkLibDir = resolveVddkSetting(cmd.getVddkLibDir(), serverResource.getVddkLibDir());
108108
if (StringUtils.isBlank(vddkLibDir)) {
109109
String err = String.format("VDDK lib dir is not configured on the host. " +
110-
"Set '%s' in agent.properties or in details parameter of the import api calll to use VDDK-based conversion.", "vddk.lib.dir");
110+
"Set '%s' in agent.properties or in details parameter of the import api call to use VDDK-based conversion.", "vddk.lib.dir");
111111
logger.error("({}) {}", originalVMName, err);
112112
return new Answer(cmd, false, err);
113113
}

0 commit comments

Comments
 (0)