Merge branch 'apigee-sso-provider' of https://github.com/apache/usergrid into SSO2-Usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f097e35e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f097e35e Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f097e35e Branch: refs/heads/master Commit: f097e35eecfbb62bca7344d91a6c68e057c09420 Parents: 87dad49 71cbd8e Author: Ayesha Dastagiri <ayesha.am...@gmail.com> Authored: Mon Jun 27 00:20:31 2016 -0700 Committer: Ayesha Dastagiri <ayesha.am...@gmail.com> Committed: Mon Jun 27 00:20:31 2016 -0700 ---------------------------------------------------------------------- .../cassandra/ManagementServiceImpl.java | 7 +++++++ .../usergrid/security/sso/ApigeeSSO2Provider.java | 16 ++++++++++++++++ .../usergrid/security/sso/ExternalSSOProvider.java | 16 ++++++++++++++++ .../usergrid/security/sso/SSOProviderFactory.java | 17 ++++++++++++++++- .../security/sso/UsergridExternalProvider.java | 16 ++++++++++++++++ 5 files changed, 71 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
