Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated the PSDscRunAsCredential Account for Farm Creation #327

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Updated the PSDscRunAsCredential Account for Farm Creation #327

wants to merge 19 commits into from

Conversation

NikCharlebois
Copy link
Contributor

Farm now gets created under domain credentials

@vikasnav
Copy link
Member

vikasnav commented Feb 9, 2018

Nik I see that you have the files picked up from you branch and master. Also there are some conflicts. can you resolve and send the PR

@NikCharlebois
Copy link
Contributor Author

@vikasnav can you elaborate on what you mean by "you have the files picked up from you branch and master"? Also, how can I resolve conflicts, I don't seem to have the proper access to do so. The resolve conflicts button is disabled for me on my PR. Thanks

@dsghi
Copy link

dsghi commented Jun 7, 2018

I do love the idea of updating this template to target the latest server version. :)

@NikCharlebois I beleive what @vikasnav is referring to is if you look at the changes you're proposing such as in the sharepoint-2016-non-ha/azuredeploy.json it's showing changing from 'Azure' to 'NikCharlebois'.

@NikCharlebois
Copy link
Contributor Author

@vikasnav Changes made. Thanks

@vikasnav
Copy link
Member

There are some conflicts. Can you please resolve and send the PR again

@NikCharlebois
Copy link
Contributor Author

@vikasnav Not sure how the zip file can be conflicting, we should simply overwrite the existing one with the updated package. Same goes for the readme.

"spassetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/sharepoint-2016-non-ha",
"adAssetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/ad-non-ha",
"sqlAssetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/sql-2014-non-ha",
"spassetLocation": "https://raw.githubusercontent.com/NikCharlebois/AzureStack-QuickStart-Templates/Test/sharepoint-2016-non-ha/",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this cant change

Copy link
Member

@bganapa bganapa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor comment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants