Merge upstream main commits into agora_2.0 dev branch #2680
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
Arcbox 3.0 - Customize tags
Arcbox 3.0 - Fixed app and ingress
…PinnedSchemaVersion parameters
…PinnedSchemaVersion parameters
Arcbox 3.0 - Set CustomLocationId to a default value other than null to avoid errors in ITPro flavor
…king-change Revert changes for powershell get-azaccesstoken
fix ConvertFrom-securestring issue
Arcbox 3.0 patches
ArcBox 3.0 - fix k3s login message
* add nodes for k3s deployment * fix k3s cluster reference * Remove CAPI ref * Remove reset bookstore
* Moved DSC configuration for Hyper-V and VM Switch from Common to DataOps and ITPro Signed-off-by: Jan Egil Ring <[email protected]> * Updated Hyper-V DSC for ITPro and DevOps Signed-off-by: Jan Egil Ring <[email protected]> * Do not install Hyper-V if flavor is DevOps Signed-off-by: Jan Egil Ring <[email protected]> --------- Signed-off-by: Jan Egil Ring <[email protected]>
[HCIBox] Update ARM template deployment process to match upstream changes
|
Hi dkirby-ms! Thank you for opening this Pull Request. Someone will review it soon. Thank you for committing to making the Arc Jumpstart better. |
|
I suggest we do an upstream merge to agora_2.0. It looks like the ArcBox 2.0 changes are missing along with some HCIbox fixes we had. Lets merge from upstream before we get too far along with agora2 dev. |
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.
No description provided.