merge with branch 1.x

This commit is contained in:
Sebastian Sdorra
2017-06-25 19:01:33 +02:00
81 changed files with 4617 additions and 1319 deletions

View File

@@ -49,7 +49,8 @@ import java.io.IOException;
import java.util.Map;
/**
*
* Guava based implementation of {@link CacheManager} and {@link org.apache.shiro.cache.CacheManager}.
*
* @author Sebastian Sdorra
*/
@Singleton
@@ -57,7 +58,7 @@ public class GuavaCacheManager
implements CacheManager, org.apache.shiro.cache.CacheManager
{
/**
/**
* the logger for GuavaCacheManager
*/
private static final Logger logger =