Merge branch '1.1.x'

This commit is contained in:
Stephane Nicoll 2015-01-26 03:28:17 +01:00
commit f5f0952837

View File

@ -242,7 +242,7 @@ public class HealthIndicatorAutoConfiguration {
@Bean
@ConditionalOnMissingBean(name = "solrHealthIndicator")
public HealthIndicator rabbitHealthIndicator() {
public HealthIndicator solrHealthIndicator() {
if (this.solrServers.size() == 1) {
return new SolrHealthIndicator(this.solrServers.entrySet().iterator()
.next().getValue());