-
Notifications
You must be signed in to change notification settings - Fork 5.2k
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
Resolve merge conflict on custom-words.txt for Microsoft.ContainerService/aks 2023-10-01 #26585
Merged
FumingZhang
merged 1 commit into
Azure:dev-containerservice-Microsoft.ContainerService-2023-10-01
from
FumingZhang:fuming/dev-cs-1001
Nov 7, 2023
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
Next Steps to Merge✔️ All automated merging requirements have been met! Refer to step 4 in the PR workflow diagram (even if your PR is for data plane, not ARM). |
Swagger Validation Report
|
Swagger Generation Artifacts
|
Swagger pipeline started successfully. If there is ApiView generated, it will be updated in this comment. |
Resolve merge conflict for PR #26483. |
matthchr
approved these changes
Nov 7, 2023
FumingZhang
merged commit Nov 7, 2023
5f495af
into
Azure:dev-containerservice-Microsoft.ContainerService-2023-10-01
28 checks passed
zizw123
pushed a commit
that referenced
this pull request
Nov 7, 2023
…add version stable/2023-10-01 (#26483) * Adds base for updating Microsoft.ContainerService/aks from version stable/2023-09-01 to version 2023-10-01 * Updates readme * Updates API version in new specs and examples * Add rest api specs for node public IP IPtags and IP-based Load Balancers (#26389) * feat: add rest api spec for node public IP IPTags * feat: add rest api spec for ip-based load balancer * Add API spec for AKS HostNetwork NSG Control (#26385) * update readme (#26388) * Update custom words for ContainerService/aks 2023-10-01 (#26481) * add CapacityReservationGroup into custom-words.txt (#26461) Co-authored-by: tong chen <tonche@microsoft.com> * add lower case capacityreservationgroup (#26475) Co-authored-by: tong chen <tonche@microsoft.com> --------- Co-authored-by: Tong Chen <99183466+tonychen15@users.noreply.github.com> Co-authored-by: tong chen <tonche@microsoft.com> * restored to dev branch base (#26451) Co-authored-by: tong chen <tonche@microsoft.com> * resolve conflict (#26585) --------- Co-authored-by: Qi Ni <pomelonicky@gmail.com> Co-authored-by: Jialun Cai <jialun.cai@pm.me> Co-authored-by: Tong Chen <99183466+tonychen15@users.noreply.github.com> Co-authored-by: tong chen <tonche@microsoft.com>
zman-ms
pushed a commit
that referenced
this pull request
Jan 10, 2024
…add version stable/2023-10-01 (#26483) * Adds base for updating Microsoft.ContainerService/aks from version stable/2023-09-01 to version 2023-10-01 * Updates readme * Updates API version in new specs and examples * Add rest api specs for node public IP IPtags and IP-based Load Balancers (#26389) * feat: add rest api spec for node public IP IPTags * feat: add rest api spec for ip-based load balancer * Add API spec for AKS HostNetwork NSG Control (#26385) * update readme (#26388) * Update custom words for ContainerService/aks 2023-10-01 (#26481) * add CapacityReservationGroup into custom-words.txt (#26461) Co-authored-by: tong chen <tonche@microsoft.com> * add lower case capacityreservationgroup (#26475) Co-authored-by: tong chen <tonche@microsoft.com> --------- Co-authored-by: Tong Chen <99183466+tonychen15@users.noreply.github.com> Co-authored-by: tong chen <tonche@microsoft.com> * restored to dev branch base (#26451) Co-authored-by: tong chen <tonche@microsoft.com> * resolve conflict (#26585) --------- Co-authored-by: Qi Ni <pomelonicky@gmail.com> Co-authored-by: Jialun Cai <jialun.cai@pm.me> Co-authored-by: Tong Chen <99183466+tonychen15@users.noreply.github.com> Co-authored-by: tong chen <tonche@microsoft.com>
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.
ARM (Control Plane) API Specification Update Pull Request
PR review workflow diagram
Please understand this diagram before proceeding. It explains how to get your PR approved & merged.
[1] ARM review queue (for merge queues, see [4])
The PRs are processed by time opened, ascending. Your PR may show up on 2nd or later page.
If you addressed Step 1 from the diagram and your PR is not showing up in the queue, ensure the label
ARMChangesRequested
is removed from your PR. This should cause the label
WaitForARMFeedback
to be added.[2] https://aka.ms/azsdk/support/specreview-channel
[3] List of SDK breaking changes approvers in pinned Teams announcement
[4] public repo merge queue, private repo merge queue (for ARM review queue, [1])
If you need further help with anything, see
Getting help
section below.Purpose of this PR
What's the purpose of this PR? Check all that apply. This is mandatory!
Due diligence checklist
To merge this PR, you must go through the following checklist and confirm you understood
and followed the instructions by checking all the boxes:
ARM resource provider contract and
REST guidelines (estimated time: 4 hours).
I understand this is required before I can proceed to Step 2, "ARM Review", for this PR.
Breaking changes review (Step 1)
you must follow the breaking changes process.
IMPORTANT This applies even if:
Such claims must be reviewed, and the process is the same.
ARM API changes review (Step 2)
ARMReview
label.Viewing API changes
For convenient view of the API changes made by this PR, refer to the URLs provided in the table
in the
Generated ApiView
comment added to this PR. You can use ApiView to show API versions diff.Suppressing failures
If one or multiple validation error/warning suppression(s) is detected in your PR, please follow the
Swagger-Suppression-Process
to get approval.
Getting help
and https://aka.ms/ci-fix.