Merge branch 'release-2.1.1' into usegrid-1283-mgmt-app-init
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8ebc28df Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8ebc28df Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8ebc28df Branch: refs/heads/usergrid-1268-akka-211 Commit: 8ebc28dfd8e0d1abe4edec8a3941175238400ea4 Parents: 12743f3 aae8fdf Author: Dave Johnson <[email protected]> Authored: Tue May 24 10:01:25 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Tue May 24 10:01:25 2016 -0400 ---------------------------------------------------------------------- .../applications/ApplicationResourceIT.java | 5 +-- .../usergrid/security/shiro/ShiroCache.java | 44 +++++++++++++++++++- 2 files changed, 44 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
