Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/asf/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/aae8fdf8 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/aae8fdf8 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/aae8fdf8 Branch: refs/heads/release-2.1.1 Commit: aae8fdf817c59a57ef875ab5f8aa9e7a47a945ab Parents: ebcc772 5107ccf Author: Dave Johnson <[email protected]> Authored: Fri May 20 12:02:02 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Fri May 20 12:02:02 2016 -0400 ---------------------------------------------------------------------- .../usergrid/security/shiro/ShiroCache.java | 44 +++++++++++++++++++- 1 file changed, 42 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
