GitHub user ayesha12 opened a pull request:

    https://github.com/apache/usergrid/pull/544

    Sso2 usergrid

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/ayesha12/usergrid SSO2-Usergrid

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/usergrid/pull/544.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #544
    
----
commit 6756035f77416c237e570291d117c29356f62d3c
Author: Ayesha Dastagiri <[email protected]>
Date:   2016-06-24T17:54:20Z

    Merge remote-tracking branch 'upstream/master' into SSO2-Usergrid

commit 87dad4977d5541ebe31ef120eba399b2eb17f9b1
Author: Ayesha Dastagiri <[email protected]>
Date:   2016-06-25T00:03:10Z

    Merge branch 'apigee-sso-provider' of https://github.com/apache/usergrid 
into SSO2-Usergrid

commit f097e35eecfbb62bca7344d91a6c68e057c09420
Author: Ayesha Dastagiri <[email protected]>
Date:   2016-06-27T07:20:31Z

    Merge branch 'apigee-sso-provider' of https://github.com/apache/usergrid 
into SSO2-Usergrid

commit 526748bba4e40c0c2eb79d816be98f0dd62b3e39
Author: Ayesha Dastagiri <[email protected]>
Date:   2016-06-27T20:39:54Z

    Merge branch 'apigee-sso-provider' of https://github.com/apache/usergrid 
into SSO2-Usergrid

commit 66ca27c6fadcd322dcb9f32f3fca2fd14f6bf1d0
Author: Ayesha Dastagiri <[email protected]>
Date:   2016-07-07T23:34:47Z

    disabling activationWorkFlow if  external SSO provider is enabled.

commit 2c59bd8ee5c4313142a929e2f8301b83c00f3a1b
Author: Ayesha Dastagiri <[email protected]>
Date:   2016-07-08T00:52:46Z

    adding a check to ensure activationConfirmation emails are not sent for 
external sos provider enabled requests.

commit 3ba4e596c5bccffea4d7fd481e55c1590886322e
Author: Ayesha Dastagiri <[email protected]>
Date:   2016-07-08T00:56:39Z

    Merge branch 'apigee-sso-provider' of https://github.com/apache/usergrid 
into SSO2-Usergrid

commit b583207ab9ce373300af0e19ea9a04014461a431
Author: Ayesha Dastagiri <[email protected]>
Date:   2016-07-08T15:34:03Z

    Handling Exception - when admin user is not found in UG as it needs to be 
activated via external provider.

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to