Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll
2017-06-07 18:42:40 +03:00
3 changed files with 7 additions and 7 deletions

View File

@@ -3,7 +3,7 @@ management.security.enabled=false
#
# Infinispan configuration file location.
#
#spring.cache.infinispan.config=infinispan.xml
spring.cache.infinispan.config=infinispan.xml
#
@@ -15,4 +15,4 @@ management.security.enabled=false
#
# Caffeine configuration
#
#spring.cache.caffeine.spec=maximumSize=200,expireAfterAccess=600s
spring.cache.caffeine.spec=maximumSize=200,expireAfterAccess=600s

View File

@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<infinispan xmlns="urn:infinispan:config:7.2">
<infinispan xmlns="urn:infinispan:config:8.2">
<cache-container default-cache="default">
<local-cache name="countries" statistics="true">
<local-cache name="default"/>
<local-cache name="countries">
<eviction max-entries="200"/>
<expiration lifespan="600000"/>
</local-cache>