root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '2.5.x' 

Closes gh-28073
This commit is contained in:
Stephane Nicoll 2021-09-21 08:19:58 +02:00
parent 01cf19702b 4ee249c700
commit 3e5038cddd
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -614,6 +614,12 @@
"description": "Type of Couchbase repositories to enable.", "description": "Type of Couchbase repositories to enable.",
"defaultValue": "auto" "defaultValue": "auto"
}, },
{
"name": "spring.data.elasticsearch.client.reactive.endpoints",
"defaultValue": [
"localhost:9200"
]
},
{ {
"name": "spring.data.elasticsearch.cluster-name", "name": "spring.data.elasticsearch.cluster-name",
"type": "java.lang.String", "type": "java.lang.String",