Skip to content
This repository was archived by the owner on Sep 29, 2023. It is now read-only.

Integration: Merge release.0.3 to master - #24

Merged
yugangw-msft merged 19 commits into
masterfrom
release.0.3
Jun 16, 2016
Merged

Integration: Merge release.0.3 to master#24
yugangw-msft merged 19 commits into
masterfrom
release.0.3

Conversation

@yugangw-msft

Copy link
Copy Markdown
Contributor

We have published 0.3.0, so the integration will get sources in sync.

/CC:@addev-ashish

yugangw-msft and others added 19 commits April 4, 2016 09:18
This change make unit tests pass for Windows running Python 3.5
This change removed all callbacks from the test code to match the code
fixes recently pushed.
Updated gitignore to ignore files created by VS
# Conflicts:
#	adal/self_signed_jwt.py
#	adal/token_request.py
…thon 2 and Python 3, also fixing a wierd behavior with Mock which was causing a wstrust testcase to fail
…ssword was replaced with a string that shows it is fake
* update readme and samples

* use msdn walkthrough for service principal
This change adds 2 federation providers to the whitelist of federation
providers in the ADAL library
1. The US government one (login-us.microsoftonline.com)
2. The German government one (login.microsoftonline.de)
@yugangw-msft
yugangw-msft merged commit e46dc48 into master Jun 16, 2016
@yugangw-msft
yugangw-msft deleted the release.0.3 branch October 31, 2016 20:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants