Merge branch 'sso-conn-pool' into USERGRID-579-jcloud171
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e0d9fe67 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e0d9fe67 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e0d9fe67 Branch: refs/heads/master Commit: e0d9fe675cdcb45477f21db412dfd79221ffb857 Parents: e707628 c6289d5 Author: Dave Johnson <[email protected]> Authored: Fri May 15 12:20:22 2015 -0400 Committer: Dave Johnson <[email protected]> Committed: Fri May 15 12:20:22 2015 -0400 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 5 ++ stack/rest/pom.xml | 6 ++ .../rest/management/ManagementResource.java | 71 +++++++++++++++++--- 3 files changed, 73 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
