Merge remote-tracking branch 'origin/v1'

This commit is contained in:
tigerbot 2017-06-15 12:46:59 -06:00
commit 5163463dd2
1 changed files with 2 additions and 2 deletions

View File

@ -1102,10 +1102,10 @@
me._resourceProviderUri = opts.providerUri; me._resourceProviderUri = opts.providerUri;
} }
if (opts.identityProviderUri) { if (opts.identityProviderUri) {
me._identityProviderUri = opts.providerUri; me._identityProviderUri = opts.identityProviderUri;
} }
if (opts.resourceProviderUri) { if (opts.resourceProviderUri) {
me._resourceProviderUri = opts.providerUri; me._resourceProviderUri = opts.resourceProviderUri;
} }
if (opts.session) { if (opts.session) {
if (!me._identityProviderUri) { if (!me._identityProviderUri) {