-
Notifications
You must be signed in to change notification settings - Fork 16
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
OfficeOnlineServerHost: New resource proposal #63
OfficeOnlineServerHost: New resource proposal #63
Conversation
I think this resource would be better if it instead of AllowList had the parameters I think parameter |
I have adapted the resource according to your suggestions. |
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.
I see duplicate files. It seems you have copied the resource folder into the resource folder (duplicate folder names here): src/DSCResources/MSFT_OfficeOnlineServerHost/MSFT_OfficeOnlineServerHost/MSFT_OfficeOnlineServerHost.psm1
I will review as soon as I have time.
Reviewable status: 0 of 12 files reviewed, all discussions resolved
- OfficeOnlineServerDsc - Updated to latest pipeline files.
Thx. I have removed the duplicate folder. |
@JonasCassier I merged a PR updating all the pipeline files, so if your rebase the pipeline in this PR should run correctly. |
…assier/OfficeOnlineServerDsc into Feature/OfficeWebAppsHost
…assier/OfficeOnlineServerDsc into Feature/OfficeWebAppsHost
Still to many files because you have no remote to the upstream repo that have the new changes, So in your case you need another remote for the upstream to be able to get them down to you local repository. I think this should work for you, let me know if anything fails: # add remote to upstream
git remote add upstream https://github.com/dsccommunity/OfficeOnlineServerDsc.git
# fetch changes from upstream branch master
git fetch upstream master
# rebase the local repository branch master
git checkout master
git rebase upstream/master
# push the updated branch master to your forked GitHub repository
git push origin --force
# Rebase the working (PR) branch using the updated local branch master
git checkout Feature/OfficeWebAppsHost
git rebase upstream/master
# Fix any conflicts as you did before
# When there are no more conflicts, run the following to update the working branch in your forked GitHub repository (which will update the PR)
git push origin --force |
…assier/OfficeOnlineServerDsc into Feature/OfficeWebAppsHost
@johlju I got into a mess of merge conflicts, so I created a new Branch: git checkout master git fetch upstream master
git checkout master git rebase upstream/master git push origin --force Here is the new PR #66 |
duplicates #66 |
Pull Request (PR) description
OfficeOnlineServerHost: New resource proposal
This Pull Request (PR) fixes the following issues
Task list
file CHANGELOG.md. Entry should say what was changed and how that
affects users (if applicable), and reference the issue being resolved
(if applicable).
and comment-based help.
This change is