You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/05/19 16:50:32 UTC

[4/7] incubator-usergrid git commit: Merge branch 'sso-conn-pool' into USERGRID-579-jcloud171

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 <dm...@apigee.com>
Authored: Fri May 15 12:20:22 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
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(-)
----------------------------------------------------------------------