From 53700809ed38e0332c14bbd9f4ed2d2398c38348 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Sun, 13 Apr 2025 23:25:59 -0400
Subject: [PATCH] fix conflict - logger

---
 .../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());