Merge branch '2.6.x' into 2.7.x

Closes gh-31883
2022-07-27 09:23:05 +02:00
parent 9cb614c626 e92c64f633
commit 53a652ec65
11 changed files with 25 additions and 12 deletions
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml
+++ b/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml
@@ -6,7 +6,7 @@
 	<map name="defaultCache" />
 	<network>
 		<join>
-			<tcp-ip enabled="false"/>
+			<auto-detection enabled="false"/>
 			<multicast enabled="false"/>
 		</join>
 	</network>