Merge commit 'refs/pull/532/head' of github.com:apache/usergrid into release-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a1cb1f5f Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a1cb1f5f Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a1cb1f5f Branch: refs/heads/master Commit: a1cb1f5f45352a3dc7e7c0df91bb037e027d0ddd Parents: 8976b41 ed4e67c Author: Michael Russo <[email protected]> Authored: Fri Jun 3 07:42:43 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Fri Jun 3 07:42:43 2016 -0700 ---------------------------------------------------------------------- .../usergrid/security/shiro/ShiroCache.java | 80 ++++++++++++-------- 1 file changed, 49 insertions(+), 31 deletions(-) ----------------------------------------------------------------------
