Merge branch '1.1.x'

2014-09-17 10:46:30 -07:00
parent d441e7af93 611f978181
commit 88f8eb7fa4
3 changed files with 3 additions and 3 deletions
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java
@@ -133,7 +133,7 @@ public class MetricRepositoryAutoConfiguration {

 		@Bean
 		@ConditionalOnMissingBean(name = "metricsExecutor")
-		protected Executor metricsExecutor() {
+		public Executor metricsExecutor() {
 			ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
 			return executor;
 		}