(cloudstack) branch 4.20 updated: fix conflict - logger

[pearl11594]

This is an automated email from the ASF dual-hosted git repository.

pearl11594 pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.20 by this push:
     new 53700809ed3 fix conflict - logger
53700809ed3 is described below

commit 53700809ed38e0332c14bbd9f4ed2d2398c38348
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Sun Apr 13 23:25:59 2025 -0400

    fix conflict - logger
---
 .../cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java 
b/framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java
index e6ea0d8be32..b8102c63654 100644
--- a/framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java
+++ b/framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java
@@ -1110,7 +1110,7 @@ public class ClusterManagerImpl extends ManagerBase 
implements ClusterManager, C
                     _mshostDao.update(_mshostId, mshost);
                     mshostStatusDao.update(mshostStatus.getId(), mshostStatus);
                 } else {
-                    s_logger.warn(String.format("Found a management server 
host [%s] without a status. This should never happen!", mshost));
+                    logger.warn(String.format("Found a management server host 
[%s] without a status. This should never happen!", mshost));
                     mshostStatus = new ManagementServerStatusVO();
                     mshostStatus.setMsId(mshost.getUuid());
                     mshostStatus.setLastSystemBoot(new Date());