-
Notifications
You must be signed in to change notification settings - Fork 728
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
base: master
Are you sure you want to change the base?
Conversation
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 |
@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 |
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 |
@vikasnav Changes made. Thanks |
There are some conflicts. Can you please resolve and send the PR again |
@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/", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this cant change
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor comment
Farm now gets created under domain credentials