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/6f90ebaf Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6f90ebaf Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6f90ebaf Branch: refs/heads/master Commit: 6f90ebaf52c3918fe8ac1623fbcad53e127b16b2 Parents: e0d9fe6 5079d47 Author: Dave Johnson <[email protected]> Authored: Mon May 18 13:49:56 2015 -0400 Committer: Dave Johnson <[email protected]> Committed: Mon May 18 13:49:56 2015 -0400 ---------------------------------------------------------------------- .../rest/management/ManagementResource.java | 60 +++++++++++--------- 1 file changed, 32 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
