Merge branch '1.5.x'

8 years ago · 133739b222
parent 3ac13a4af0 7dfa3a8c83
commit 133739b222
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java
@ -68,7 +68,7 @@ class CaffeineCacheConfiguration {
 	}

 	@Bean
-	public CaffeineCacheManager caffeineCacheManager() {
+	public CaffeineCacheManager cacheManager() {
 		CaffeineCacheManager cacheManager = createCacheManager();
 		List<String> cacheNames = this.cacheProperties.getCacheNames();
 		if (!CollectionUtils.isEmpty(cacheNames)) {