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/526748bb Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/526748bb Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/526748bb Branch: refs/heads/apigee-sso-provider Commit: 526748bba4e40c0c2eb79d816be98f0dd62b3e39 Parents: f097e35 3764234 Author: Ayesha Dastagiri <ayesha.am...@gmail.com> Authored: Mon Jun 27 13:39:54 2016 -0700 Committer: Ayesha Dastagiri <ayesha.am...@gmail.com> Committed: Mon Jun 27 13:39:54 2016 -0700 ---------------------------------------------------------------------- .../apache/usergrid/security/sso/ApigeeSSO2Provider.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ----------------------------------------------------------------------