Merge branch '2.5.x' into 2.6.x

Closes gh-29903
spring-projects · Feb 18, 2022 · 9da6fb4 · 9da6fb4
2 parents 0cebb33 + c676b8b
commit 9da6fb4
Showing 1 changed file with 0 additions and 47 deletions.
diff --git a/...c/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesKafka24Tests.java b/...c/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesKafka24Tests.java