From 1a1130cfc0fc3189d0832de72ad00e228e857d58 Mon Sep 17 00:00:00 2001 From: Nageswara Nandigam Date: Fri, 11 Oct 2024 16:37:51 -0700 Subject: [PATCH] merge conflict --- azurelinuxagent/ga/logcollector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurelinuxagent/ga/logcollector.py b/azurelinuxagent/ga/logcollector.py index e9aa3b146e..5de4f029cc 100644 --- a/azurelinuxagent/ga/logcollector.py +++ b/azurelinuxagent/ga/logcollector.py @@ -27,7 +27,7 @@ from heapq import heappush, heappop from azurelinuxagent.common.conf import get_lib_dir, get_ext_log_dir, get_agent_log_file -from azurelinuxagent.common.event import initialize_event_logger_vminfo_common_parameters, add_event, WALAEventOperation +from azurelinuxagent.common.event import initialize_event_logger_vminfo_common_parameters_and_protocol, add_event, WALAEventOperation from azurelinuxagent.common.future import ustr from azurelinuxagent.ga.logcollector_manifests import MANIFEST_NORMAL, MANIFEST_FULL