Merge branch 'two-dot-o-dev' into usergrid-103-upgrade-jersey
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4918a5a2 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4918a5a2 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/4918a5a2 Branch: refs/heads/usergrid-1007-shiro-cache Commit: 4918a5a2a0f2f5372a78da5cb119d7b24b6f6e82 Parents: 0db8622 2dd90b1 Author: Dave Johnson <[email protected]> Authored: Wed Sep 9 15:15:39 2015 -0400 Committer: Dave Johnson <[email protected]> Committed: Wed Sep 9 15:15:39 2015 -0400 ---------------------------------------------------------------------- .../service/StatusServiceImpl.java | 22 ++++-- .../usergrid/persistence/StatusServiceIT.java | 75 ++++++++++++++++++++ .../usergrid/rest/ApplicationsResource.java | 3 +- 3 files changed, 93 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/4918a5a2/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java ----------------------------------------------------------------------
