You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/08/01 16:54:05 UTC
[30/50] [abbrv] usergrid git commit: Merge commit
'refs/pull/551/head' of github.com:apache/usergrid into apigee-sso-provider
Merge commit 'refs/pull/551/head' of github.com:apache/usergrid into apigee-sso-provider
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a22dc921
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a22dc921
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a22dc921
Branch: refs/heads/master
Commit: a22dc921fa21b2e5f16a09e4a18cdc60a4080079
Parents: 4e93bd6 f8d5713
Author: Michael Russo <mr...@apigee.com>
Authored: Tue Jul 26 14:10:00 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Tue Jul 26 14:10:00 2016 -0700
----------------------------------------------------------------------
.../main/resources/usergrid-default.properties | 3 +
stack/rest/pom.xml | 8 +
.../usergrid/rest/AbstractContextResource.java | 16 ++
.../rest/management/ManagementResource.java | 49 +++---
.../organizations/OrganizationsResource.java | 18 +-
.../rest/management/ExternalSSOEnabledIT.java | 175 +++++++++++++++++++
.../rest/management/ManagementResourceIT.java | 24 ++-
stack/services/pom.xml | 2 +-
.../cassandra/ManagementServiceImpl.java | 26 ++-
.../security/sso/ApigeeSSO2Provider.java | 28 +--
.../tokens/cassandra/TokenServiceImpl.java | 3 +
11 files changed, 300 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a22dc921/stack/config/src/main/resources/usergrid-default.properties
----------------------------------------------------------------------