Merge branch '1.5.x'

2017-01-04 10:48:25 +01:00
parent 43f5c3564b bf7271afa5
commit 9a113e3b64
5 changed files with 19 additions and 9 deletions
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -4082,7 +4082,7 @@ cache:
 		public CacheManagerCustomizer<CouchbaseCacheManager> cacheManagerCustomizer() {
 			return c -> {
 				c.prepareCache("biz", CacheBuilder.newInstance(anotherBucket())
-						.withExpirationInMillis(2000));
+						.withExpiration(2));
 			};
 		}