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

Merge branch '2.1.x' 

Closes gh-17764
This commit is contained in:
Stephane Nicoll 2019-08-02 13:57:22 +02:00
parent a6151ba637 308a5e9360
commit 2784fc1506
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorAutoConfiguration.java
View File

@ -54,7 +54,7 @@ public class CassandraReactiveHealthIndicatorAutoConfiguration extends
CompositeReactiveHealthIndicatorConfiguration<CassandraReactiveHealthIndicator, ReactiveCassandraOperations> { CompositeReactiveHealthIndicatorConfiguration<CassandraReactiveHealthIndicator, ReactiveCassandraOperations> {
@Bean @Bean
@ConditionalOnMissingBean(name = "cassandraReactiveHealthIndicator") @ConditionalOnMissingBean(name = "cassandraHealthIndicator")
public ReactiveHealthIndicator cassandraHealthIndicator( public ReactiveHealthIndicator cassandraHealthIndicator(
Map<String, ReactiveCassandraOperations> reactiveCassandraOperations) { Map<String, ReactiveCassandraOperations> reactiveCassandraOperations) {
return createHealthIndicator(reactiveCassandraOperations); return createHealthIndicator(reactiveCassandraOperations);