Pr/the rsp/466 merge from master #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
update with main repo
rebase action 1
rebase commit 2
Adds tutorial for deploying F# script with ACI
Adds a tutorial for creating a Minecraft Server on ACI
Fix an issue with Event Grid dependency on storage queues.
# Conflicts: # RELEASE_NOTES.md
Make namespace UUID algorithm compliant with RFC4122:
# Conflicts: # Farmer.sln # RELEASE_NOTES.md # docs/content/api-overview/resources/arm.md # src/Farmer/Common.fs # src/Farmer/Deploy.fs # src/Farmer/Farmer.fsproj # src/Tests/Tests.fsproj # src/Tests/test-data/lots-of-resources.json
r30e
pushed a commit
that referenced
this pull request
Oct 27, 2021
Support generating KeyVault keys
BlakeWills
pushed a commit
that referenced
this pull request
Apr 4, 2022
Update code example from quickDeploy to quickWrite
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed, this brings up this branch inline with latest main branch. Unit tests all run, but I would really like a second pair of eyes on this in terms of the merge - there were a few conflicts but most were one-liners.