Merge commit 'refs/pull/618/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/76dc7a4b Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/76dc7a4b Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/76dc7a4b Branch: refs/heads/master Commit: 76dc7a4b8bcf655d589680dfb93134f398c597c6 Parents: 87f53a9 8b7aa27 Author: Michael Russo <[email protected]> Authored: Sat Dec 29 11:15:44 2018 -0800 Committer: Michael Russo <[email protected]> Committed: Sat Dec 29 11:15:44 2018 -0800 ---------------------------------------------------------------------- .../rest/management/ManagementResource.java | 3 + .../usergrid/security/shiro/ShiroCache.java | 131 +++++++++++-------- 2 files changed, 79 insertions(+), 55 deletions(-) ----------------------------------------------------------------------
