Merge branch 'release-2.1.1' into usergrid-1268-akka-211
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6fadf80b Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6fadf80b Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6fadf80b Branch: refs/heads/release-2.1.1 Commit: 6fadf80bcdd71e4bc894b43bf4d19659a89f4bf6 Parents: bc857e3 0970e1d Author: Dave Johnson <[email protected]> Authored: Fri May 27 14:08:51 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Fri May 27 14:08:51 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/6fadf80b/stack/config/src/main/resources/usergrid-default.properties ----------------------------------------------------------------------
