Commit 8ea38d1c authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.5.x'

parents a1ab994e 58a1ed19
......@@ -262,6 +262,7 @@ public class HealthIndicatorAutoConfiguration {
}
@Configuration
@ConditionalOnClass(MongoTemplate.class)
@ConditionalOnBean(MongoTemplate.class)
@ConditionalOnEnabledHealthIndicator("mongo")
public static class MongoHealthIndicatorConfiguration extends
......
......@@ -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(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment