resolving conflict #29343
Merged
resolving conflict #29343
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 MergeNext steps that must be taken to merge this PR:
|
Swagger Validation Report
|
| Compared specs (v2.2.2) | new version | base version |
|---|---|---|
| package-2023-11-preview | package-2023-11-preview(9abd943) | default(release-network-Microsoft.Network-2024-01-01) |
️️✔️Avocado succeeded [Detail] [Expand]
Validation passes for Avocado.
️️✔️SwaggerAPIView succeeded [Detail] [Expand]
️️✔️TypeSpecAPIView succeeded [Detail] [Expand]
️️✔️ModelValidation succeeded [Detail] [Expand]
Validation passes for ModelValidation.
️️✔️SemanticValidation succeeded [Detail] [Expand]
Validation passes for SemanticValidation.
️️✔️SpellCheck succeeded [Detail] [Expand]
Validation passes for SpellCheck.
️️✔️PR Summary succeeded [Detail] [Expand]
Validation passes for Summary.
️️✔️Automated merging requirements met succeeded [Detail] [Expand]
Swagger Generation Artifacts
|
Generated ApiView
|
This was referenced Jun 5, 2024
AzureRestAPISpecReview
added
ARMReview
resource-manager
WaitForARMFeedback
rkmanda
approved these changes
Jun 9, 2024
rkmanda
merged commit 7e2f093
into
release-network-Microsoft.Network-2024-01-01
23 of 29 checks passed
mentat9
pushed a commit
that referenced
this pull request
Jun 21, 2024
#29473) * Adds base for updating Microsoft.Network from version stable/2023-11-01 to version 2024-01-01 * Updates readme * Updates API version in new specs and examples * Add examples for Subnet peering and v6 Subnet peering. (#28827) Add examples for Subnet peering and v6 Subnet peering. --------- Co-authored-by: saurabh83 <saugu@microsoft.com> * Init (#29127) Co-authored-by: Abhishek Shah <shabhis@microsoft.com> * Adding the new response code to the 2024-01-01 version release of swagger to match the bugfix in 2023-11-01 (#29048) Co-authored-by: Arsheen Khatib (from Dev Box) <akhatib@microsoft.com> * Added NoHealthyBackendsBehavior (#28868) Added the property "NoHealthyBackendsBehavior" to the Probe properties. * VirtualNetworkGatewayConnection using key vault for authentication. (#28760) * Add parameters for cert based auth connection * retrigger checks * retrigger checks * lintDiff * Trigger Build * revert PATCH changes * fix * change managed identity to v5 * add format and description * added networkidentifier under vnet->subet->serviceendpoint (#29292) * added networkidentifier under vnet->subet->serviceendpoint * resolving conflict (#29343) * Fix for PR VirtualNetworkGatewayConnection using key vault for authentication. (#29357) * Fix * Fix2 --------- Co-authored-by: Khushboo Baheti <khbaheti@microsoft.com> * Adding GET operaton for Network Virtual Appliance Inbound Secuirty Rule (#29339) * Moving missed changes from 2023-11-01 packet capture swagger fix to latest api version * Add CrossConnection Name as an optional query parameter in List ExpressRoute CrossConnection (#29251) * Add CrossConnection name as an optional query parameter for List CrossConnection * update example * Addressing comments * Change to OData filtering * Fix the parameter reference * Update --------- Co-authored-by: Jianqi Zhao <jianzhao@microsoft.com> * initial changes (#29235) * adding supression for the breaking change in azure-sdk-for-go * adding correct package for this supression --------- Co-authored-by: GuptaVertika <149072034+GuptaVertika@users.noreply.github.com> Co-authored-by: saurabh83 <splitt@gmail.com> Co-authored-by: saurabh83 <saugu@microsoft.com> Co-authored-by: Abhishek Shah <16267081+abhi7860@users.noreply.github.com> Co-authored-by: Abhishek Shah <shabhis@microsoft.com> Co-authored-by: AFK1194 <arsheen.khatib@gmail.com> Co-authored-by: Arsheen Khatib (from Dev Box) <akhatib@microsoft.com> Co-authored-by: Eugenio Peña García <70240915+EugenioPena@users.noreply.github.com> Co-authored-by: daweiwang-microsoft <165709729+daweiwang-microsoft@users.noreply.github.com> Co-authored-by: Bhupesh Kumar Bhatt <52891188+bhupeshbhatt1985@users.noreply.github.com> Co-authored-by: Khushboo Baheti <37917868+Khushboo-Baheti@users.noreply.github.com> Co-authored-by: Khushboo Baheti <khbaheti@microsoft.com> Co-authored-by: Ashutosh Mishra <163998769+ashutmi@users.noreply.github.com> Co-authored-by: jianzhao1992 <125631957+jianzhao1992@users.noreply.github.com> Co-authored-by: Jianqi Zhao <jianzhao@microsoft.com> Co-authored-by: nimaller <71352534+nimaller@users.noreply.github.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.
Choose a PR Template
Switch to "Preview" on this description then select one of the choices below.
Click here to open a PR for a Data Plane API.
Click here to open a PR for a Control Plane (ARM) API.