This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new f820d0125de fix end of files and codespell errors
f820d0125de is described below
commit f820d0125de3f34977cb55d8a388388f04586452
Author: Wei Zhou <[email protected]>
AuthorDate: Fri Apr 17 13:58:21 2026 +0200
fix end of files and codespell errors
---
agent/conf/agent.properties | 1 -
engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql | 1 -
.../kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java | 2 +-
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
index 013c2e5bf2a..ba4a3874664 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -472,4 +472,3 @@ iscsi.session.cleanup.enabled=false
# Optional vCenter SHA1 thumbprint for VMware to KVM conversion via VDDK,
passed as
# -io vddk-thumbprint=<value>. If unset, CloudStack computes it on the KVM
host via openssl.
#vddk.thumbprint=
-
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql
b/engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql
index 0300e555463..baa20e9f0ad 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql
@@ -59,4 +59,3 @@ UPDATE `cloud`.`configuration`
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')
WHERE name = 'user.password.reset.mail.template'
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 [...]
-
diff --git
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
index eaa8b790439..f28b5eda4a6 100644
---
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
+++
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
@@ -107,7 +107,7 @@ public class LibvirtConvertInstanceCommandWrapper extends
CommandWrapper<Convert
String vddkLibDir = resolveVddkSetting(cmd.getVddkLibDir(),
serverResource.getVddkLibDir());
if (StringUtils.isBlank(vddkLibDir)) {
String err = String.format("VDDK lib dir is not configured
on the host. " +
- "Set '%s' in agent.properties or in details
parameter of the import api calll to use VDDK-based conversion.",
"vddk.lib.dir");
+ "Set '%s' in agent.properties or in details
parameter of the import api call to use VDDK-based conversion.",
"vddk.lib.dir");
logger.error("({}) {}", originalVMName, err);
return new Answer(cmd, false, err);
}