Merge branch '2.5.x'

Closes gh-27106
5 years ago · f23fa2821c
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@ -1785,7 +1785,7 @@
				@@ -1785,7 +1785,7 @@
    },
    {
      "name": "spring.netty.leak-detection",
-      "defaultValue": "disabled"
+      "defaultValue": "simple"
    }
  ],
  "hints": [