Merge branch '2.5.x'

Closes gh-27106

Merge branch '2.5.x'
Closes gh-27106
f23fa282 · Brian Clozel · 5e6bed28 · 4db53601 · f23fa282
Commit f23fa282 authored Jun 25, 2021 by Brian Clozel
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

additional-spring-configuration-metadata.json ...es/META-INF/additional-spring-configuration-metadata.json +1 -1

No files found.
--- 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 @@
    },
    {
      "name": "spring.netty.leak-detection",
-      "defaultValue": "disabled"
+      "defaultValue": "simple"
    }
  ],
  "hints": [