Merge remote-tracking branch 'origin/GH-1189' into GH-1189 · Wzy19930507/spring-kafka@d61dd33 · GitHub

Commit

Merge remote-tracking branch 'origin/spring-projectsGH-1189' into spr…

Browse files

…ing-projectsGH-1189

# Conflicts:
#	spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/DelegatingInvocableHandler.java
#	spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/HandlerAdapter.java
#	spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/MessagingMessageListenerAdapter.java

Loading branch information

Wzy19930507 committed Jan 30, 2024

2 parents 76a2e0b + 0af8e9f commit d61dd33