mjsax opened a new pull request, #13054: URL: https://github.com/apache/kafka/pull/13054
The conflict is in `stream_upgrade_test.py` based on this PR: https://github.com/apache/kafka/pull/13022 We want the PR change as-is (conflict in L511) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org