Merge branch '2.4.x' into 2.5.x

Closes gh-28072
3 years ago · 4ee249c700
parent b2b691b1d0 0a4d58f221
commit 4ee249c700
1 changed files with 6 additions and 0 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
@ -614,6 +614,12 @@
      "description": "Type of Couchbase repositories to enable.",
      "defaultValue": "auto"
    },
    {
      "name": "spring.data.elasticsearch.client.reactive.endpoints",
      "defaultValue": [
        "localhost:9200"
      ]
    },
    {
      "name": "spring.data.elasticsearch.cluster-name",
      "type": "java.lang.String",