Merge branch '1.1.x'

2015-01-26 03:28:17 +01:00 · 2015-01-26 03:28:17 +01:00 · f5f0952837
parent 4bee1b0e1b e70c18d05b
commit f5f0952837
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
@ -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());