spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-26 20:09:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2017-06-26 13:37:18 +02:00
parent a1ab994e70 58a1ed19a9
commit 8ea38d1cbe
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
+1
View File
@@ -262,6 +262,7 @@ public class HealthIndicatorAutoConfiguration {
}
@Configuration
@ConditionalOnClass(MongoTemplate.class)
@ConditionalOnBean(MongoTemplate.class)
@ConditionalOnEnabledHealthIndicator("mongo")
public static class MongoHealthIndicatorConfiguration extends
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java
Vendored
+1 -1
View File
@@ -434,7 +434,7 @@ public class CacheAutoConfigurationTests {
}
@Test
public void hazelcastCacheExplicit() { // Fail
public void hazelcastCacheExplicit() {
load(new Class[] { HazelcastAutoConfiguration.class,
DefaultCacheConfiguration.class }, "spring.cache.type=hazelcast");
HazelcastCacheManager cacheManager = validateCacheManager(