Merge branch '2.1.x'

Closes gh-17764
This commit is contained in:
Stephane Nicoll
2019-08-02 13:57:22 +02:00

View File

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