Commit 0efade2
committed
Resolve merge conflicts for PR Azure#28780
File tree
2,628 files changed
+262452
-216085
lines changed- .github/policies
- documentation
- generated
- ArcResourceBridge/ArcResourceBridge.Autorest
- Properties
- exports
- generated
- api
- Models
- Api20221027
- Api30
- Support
- cmdlets
- runtime
- Attributes
- BuildTime
- Cmdlets
- Models
- Nodes/Collections
- Properties
- internal
- Automanage/Automanage.Autorest
- Properties
- exports
- generated
- api
- Models
- Api20220504
- Api20
- Support
- cmdlets
- runtime
- Attributes
- BuildTime
- Cmdlets
- Models
- Nodes/Collections
- Properties
- internal
- DnsResolver/DnsResolver.Autorest
- Properties
- generated/cmdlets
- resources
- ElasticSan/ElasticSan.Autorest
- Properties
- exports
- generated
- api
- Models
- cmdlets
- runtime
- internal
- Workloads/Monitors.Autorest
- Properties
- exports
- generated
- api
- Models
- Api20221001Preview
- Api20230401
- Api30
- Support
- cmdlets
- runtime
- Attributes
- BuildTime
- Cmdlets
- Models
- Nodes/Collections
- Properties
- internal
- src
- Accounts
- Accounts
- AssemblyLoading
- ArcResourceBridge
- ArcResourceBridge.Autorest
- Properties
- docs
- examples
- test
- ArcResourceBridge
- help
- Attestation
- Attestation.Autorest
- Properties
- custom
- docs
- test
- Attestation
- help
- Automanage
- Automanage.Autorest
- Properties
- docs
- examples
- test
- Automanage
- help
- Cdn
- Cdn.Autorest
- Properties
- UX/Microsoft.Cdn
- docs
- examples
- test
- Cdn
- help
- Compute
- Compute.Autorest
- Properties
- UX/Microsoft.Compute
- custom
- docs
- Compute
- help
- ConfidentialLedger
- ConfidentialLedger.Autorest
- Properties
- custom
- autogen-model-cmdlets
- docs
- test
- ConfidentialLedger
- help
- ContainerRegistry
- ContainerRegistry.Autorest
- Properties
- UX/Microsoft.ContainerRegistry
- custom
- autogen-model-cmdlets
- docs
- examples
- test
- ContainerRegistry
- help
- CosmosDB/CosmosDB
- DataFactory
- DataFactory.Management.Sdk
- Generated
- Models
- DataFactory
- DataLakeStore/DataLakeStore
- DataMigration/DataMigration/help
- DnsResolver
- DnsResolver.Autorest
- Properties
- docs
- resources
- DnsResolver
- Dns
- Dns.Autorest
- Properties
- docs
- test
- Dns
- help
- ElasticSan
- ElasticSan.Autorest
- Properties
- UX/Microsoft.ElasticSan
- custom
- docs
- examples
- test
- ElasticSan
- help
- FrontDoor
- FrontDoor.Autorest
- Properties
- UX/Microsoft.Network
- custom
- autogen-model-cmdlets
- docs
- examples
- resources
- test
- utils
- FrontDoor.Management.Sdk
- Generated
- Models
- Properties
- FrontDoor.Test
- Properties
- ScenarioTests
- SessionRecords
- Microsoft.Azure.Commands.FrontDoor.Test.ScenarioTests.ScenarioTest.FrontDoorTests
- Microsoft.Azure.Commands.FrontDoor.Test.ScenarioTests.ScenarioTest.WebApplicationFireWallPolicyTests
- FrontDoor
- Cmdlets
- Common
- Helpers
- Models
- help
- IotHub/IotHub
- KeyVault/KeyVault
- MySql
- MySql.Autorest
- Properties
- custom
- docs
- MySql
- NetAppFiles/NetAppFiles
- PolicyInsights/PolicyInsights
- ServiceFabric/ServiceFabric
- Commands/ManagedClusters/NodeTypes
- help
- SignalR/SignalR
- Storage/Storage.Management
- Synapse/Synapse
- TrustedSigning/TrustedSigning
- Workloads
- Monitors.Autorest
- Properties
- custom
- autogen-model-cmdlets
- docs
- examples
- test
- SapVirtualInstance.Autorest
- Properties
- UX/Microsoft.Workloads
- custom
- New-AzWorkloadsSapVirtualInstance
- docs
- examples
- test
- Workloads
- help
- lib
- net461
- net462
- netstandard2.0
- tools
- AzDev
- StaticAnalysis/Exceptions
- Az.ArcResourceBridge
- Az.Attestation
- Az.Automanage
- Az.Compute
- Az.ConfidentialLedger
- Az.ContainerRegistry
- Az.Dns
- Az.FrontDoor
- Az.ServiceFabric
- Az.Workloads
- TestFx/Recorder
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
2,628 files changed
+262452
-216085
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3871 | 3871 | | |
3872 | 3872 | | |
3873 | 3873 | | |
3874 | | - | |
3875 | | - | |
3876 | | - | |
3877 | | - | |
| 3874 | + | |
| 3875 | + | |
| 3876 | + | |
| 3877 | + | |
3878 | 3878 | | |
3879 | 3879 | | |
3880 | 3880 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
0 commit comments