Merge branch 'release-2.1.1' into select-mappings-nested
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/151abf78 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/151abf78 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/151abf78 Branch: refs/heads/usergrid-1268-akka-211 Commit: 151abf78f92cebd2ac8701d18b9754f65b88cfdc Parents: e9e7c39 0970e1d Author: Dave Johnson <[email protected]> Authored: Tue May 31 13:32:42 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Tue May 31 13:32:42 2016 -0400 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 5 -- .../applications/ApplicationResourceIT.java | 5 +- .../usergrid/security/shiro/ShiroCache.java | 44 +++++++++++++- .../usergrid/services/ServiceManager.java | 61 +++----------------- 4 files changed, 52 insertions(+), 63 deletions(-) ----------------------------------------------------------------------
