Skip to content
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.

Sign up for GitHub

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

Jump to bottom

chore: upgrade azure-sdk-for-go and compute sdk to 2021-07-01 #991

Merged
merged 3 commits into from Jan 13, 2022
Merged

chore: upgrade azure-sdk-for-go and compute sdk to 2021-07-01 #991

merged 3 commits into from Jan 13, 2022

Conversation

andyzhangx
Copy link
Member

@andyzhangx andyzhangx commented Jan 12, 2022 •
edited

What type of PR is this?

/kind feature

What this PR does / why we need it:

chore: upgrade azure-sdk-for-go to v58.2.0 and compute sdk to 2021-07-01

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

chore: upgrade azure-sdk-for-go to v58.2.0 and compute sdk to 2021-07-01

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

chore: upgrade azure-sdk-for-go to v58.2.0 and compute sdk to 2021-07-01

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. labels Jan 12, 2022
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 12, 2022
@andyzhangx andyzhangx changed the title chore: upgrade azure-sdk-for-go to v58.2.0 [WIP]chore: upgrade azure-sdk-for-go to v58.2.0 Jan 12, 2022
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 12, 2022
@andyzhangx andyzhangx changed the title [WIP]chore: upgrade azure-sdk-for-go to v58.2.0 chore: upgrade azure-sdk-for-go to v58.2.0 Jan 12, 2022
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 12, 2022
@coveralls
Copy link

coveralls commented Jan 12, 2022 •
edited

Coverage Status

Coverage remained the same at 80.009% when pulling 5b8e404 on andyzhangx:upgrade-azure-sdk-for-go into db57876 on kubernetes-sigs:master.

@andyzhangx andyzhangx changed the title chore: upgrade azure-sdk-for-go to v58.2.0 chore: upgrade azure-sdk-for-go and compute sdk to 2021-07-01 Jan 12, 2022
@andyzhangx
Copy link
Member Author

/retest

2 similar comments
@andyzhangx
Copy link
Member Author

/retest

@andyzhangx
Copy link
Member Author

/retest

ZeroMagic
ZeroMagic approved these changes Jan 13, 2022
View reviewed changes
Copy link
Member

@ZeroMagic ZeroMagic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 13, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, ZeroMagic

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 2283750 into kubernetes-sigs:master Jan 13, 2022
@MartinForReal
Copy link
Contributor

/cherrypick release-1.0

@MartinForReal
Copy link
Contributor

/cherrypick release-1.1

@MartinForReal
Copy link
Contributor

/cherrypick release-1.23

@k8s-infra-cherrypick-robot
Copy link

@MartinForReal: #991 failed to apply on top of branch "release-1.0":

Applying: chore: upgrade azure-sdk-for-go to v58.2.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/Azure/azure-sdk-for-go/LICENSE.txt
M	vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/dedicatedhosts.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/diskaccesses.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/diskencryptionsets.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/diskrestorepoint.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/disks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/enums.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleries.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleryapplications.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleryapplicationversions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleryimages.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleryimageversions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/images.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/loganalytics.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/models.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/snapshots.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachineextensions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachineruncommands.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachines.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetextensions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetrollingupgrades.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesets.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetvmextensions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetvmruncommands.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetvms.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/registries.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/replications.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/runs.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/tasks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/webhooks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/agentpools.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/containerservices.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/managedclusters.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/openshiftmanagedclusters.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationgatewayprivateendpointconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationgateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationsecuritygroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/azurefirewalls.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/bastionhosts.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/client.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/connectionmonitors.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/customipprefixes.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ddoscustompolicies.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ddosprotectionplans.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/dscpconfiguration.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitauthorizations.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitpeerings.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuits.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressrouteconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecrossconnectionpeerings.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecrossconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutegateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressrouteports.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/firewallpolicies.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/firewallpolicyrulecollectiongroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/flowlogs.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/hubroutetables.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/hubvirtualnetworkconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/inboundnatrules.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/inboundsecurityrule.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/interfacesgroup.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/interfacetapconfigurations.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ipallocations.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ipgroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/loadbalancerbackendaddresspools.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/loadbalancers.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/localnetworkgateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/natgateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/natrules.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/p2svpngateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/packetcaptures.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privatednszonegroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privateendpoints.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privatelinkservices.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/profiles.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/publicipaddresses.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/publicipprefixes.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routefilterrules.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routefilters.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routes.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routetables.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securitygroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securitypartnerproviders.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securityrules.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/serviceendpointpolicies.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/serviceendpointpolicydefinitions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/subnets.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualappliances.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualappliancesites.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubbgpconnection.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubbgpconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubipconfiguration.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubroutetablev2s.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubs.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkgatewayconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkgateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkpeerings.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworktaps.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualrouterpeerings.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualrouters.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualwans.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpngateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnserverconfigurations.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnserverconfigurationsassociatedwithvirtualwan.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnsites.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnsitesconfiguration.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/watchers.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/webapplicationfirewallpolicies.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/_meta.json
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationgatewayprivateendpointconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationgateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationsecuritygroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/azurefirewalls.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/bastionhosts.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/client.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/connectionmonitors.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/customipprefixes.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ddoscustompolicies.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ddosprotectionplans.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/dscpconfiguration.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitauthorizations.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitpeerings.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuits.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressrouteconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecrossconnectionpeerings.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecrossconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutegateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressrouteports.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/firewallpolicies.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/firewallpolicyrulecollectiongroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/flowlogs.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/hubroutetables.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/hubvirtualnetworkconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/inboundnatrules.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/inboundsecurityrule.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/interfacesgroup.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/interfacetapconfigurations.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ipallocations.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ipgroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/loadbalancerbackendaddresspools.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/loadbalancers.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/localnetworkgateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/natgateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/natrules.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/p2svpngateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/packetcaptures.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privatednszonegroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privateendpoints.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privatelinkservices.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/profiles.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/publicipaddresses.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/publicipprefixes.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routefilterrules.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routefilters.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routes.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routetables.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securitygroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securitypartnerproviders.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securityrules.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/serviceendpointpolicies.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/serviceendpointpolicydefinitions.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/subnets.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualappliances.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualappliancesites.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubbgpconnection.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubbgpconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubipconfiguration.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubroutetablev2s.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubs.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgatewayconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgatewaynatrules.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkpeerings.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworks.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworktaps.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualrouterpeerings.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualrouters.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualwans.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpngateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnlinkconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnserverconfigurations.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnserverconfigurationsassociatedwithvirtualwan.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnsites.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnsitesconfiguration.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/watchers.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/webapplicationfirewallpolicies.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/CHANGELOG.md
A	vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/_meta.json
A	vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/privatezones.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/virtualnetworklinks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deployments.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/groups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/resources.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/deployments.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/groups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/resources.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/accounts.go
M	vendor/github.com/Azure/azure-sdk-for-go/version/version.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/version/version.go
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/version/version.go
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/_meta.json
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/virtualnetworklinks.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/virtualnetworklinks.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/privatezones.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/privatezones.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/_meta.json deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/_meta.json left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/CHANGELOG.md deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/CHANGELOG.md left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/webapplicationfirewallpolicies.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/webapplicationfirewallpolicies.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/watchers.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/watchers.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnsitesconfiguration.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnsitesconfiguration.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnsites.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnsites.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnserverconfigurationsassociatedwithvirtualwan.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnserverconfigurationsassociatedwithvirtualwan.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnserverconfigurations.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnserverconfigurations.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnlinkconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnlinkconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpngateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpngateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualwans.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualwans.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualrouters.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualrouters.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualrouterpeerings.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualrouterpeerings.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworktaps.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworktaps.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworks.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworks.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkpeerings.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkpeerings.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgatewaynatrules.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgatewaynatrules.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgatewayconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgatewayconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubs.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubs.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubroutetablev2s.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubroutetablev2s.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubipconfiguration.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubipconfiguration.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubbgpconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubbgpconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubbgpconnection.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubbgpconnection.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualappliancesites.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualappliancesites.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualappliances.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualappliances.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/subnets.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/subnets.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/serviceendpointpolicydefinitions.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/serviceendpointpolicydefinitions.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/serviceendpointpolicies.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/serviceendpointpolicies.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securityrules.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securityrules.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securitypartnerproviders.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securitypartnerproviders.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securitygroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securitygroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routetables.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routetables.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routes.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routes.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routefilters.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routefilters.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routefilterrules.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routefilterrules.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/publicipprefixes.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/publicipprefixes.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/publicipaddresses.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/publicipaddresses.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/profiles.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/profiles.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privatelinkservices.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privatelinkservices.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privateendpoints.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privateendpoints.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privatednszonegroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privatednszonegroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/packetcaptures.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/packetcaptures.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/p2svpngateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/p2svpngateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/natrules.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/natrules.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/natgateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/natgateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/localnetworkgateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/localnetworkgateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/loadbalancers.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/loadbalancers.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/loadbalancerbackendaddresspools.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/loadbalancerbackendaddresspools.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ipgroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ipgroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ipallocations.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ipallocations.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/interfacetapconfigurations.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/interfacetapconfigurations.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/interfacesgroup.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/interfacesgroup.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/inboundsecurityrule.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/inboundsecurityrule.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/inboundnatrules.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/inboundnatrules.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/hubvirtualnetworkconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/hubvirtualnetworkconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/hubroutetables.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/hubroutetables.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/flowlogs.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/flowlogs.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/firewallpolicyrulecollectiongroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/firewallpolicyrulecollectiongroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/firewallpolicies.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/firewallpolicies.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressrouteports.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressrouteports.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutegateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutegateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecrossconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecrossconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecrossconnectionpeerings.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecrossconnectionpeerings.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressrouteconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressrouteconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuits.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuits.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitpeerings.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitpeerings.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitauthorizations.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitauthorizations.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/dscpconfiguration.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/dscpconfiguration.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ddosprotectionplans.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ddosprotectionplans.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ddoscustompolicies.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ddoscustompolicies.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/customipprefixes.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/customipprefixes.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/connectionmonitors.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/connectionmonitors.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/client.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/client.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/bastionhosts.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/bastionhosts.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/azurefirewalls.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/azurefirewalls.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationsecuritygroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationsecuritygroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationgateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationgateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationgatewayprivateendpointconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationgatewayprivateendpointconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/_meta.json deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/_meta.json left in tree.
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/_meta.json
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 12637 and retry the command.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 chore: upgrade azure-sdk-for-go to v58.2.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot
Copy link

@MartinForReal: #991 failed to apply on top of branch "release-1.1":

Applying: chore: upgrade azure-sdk-for-go to v58.2.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/Azure/azure-sdk-for-go/LICENSE.txt
M	vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/dedicatedhosts.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/diskaccesses.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/diskencryptionsets.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/diskrestorepoint.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/disks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/enums.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleries.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleryapplications.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleryapplicationversions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleryimages.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleryimageversions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/images.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/loganalytics.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/models.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/snapshots.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachineextensions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachineruncommands.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachines.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetextensions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetrollingupgrades.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesets.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetvmextensions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetvmruncommands.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetvms.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/registries.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/replications.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/runs.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/tasks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/webhooks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/agentpools.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/containerservices.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/managedclusters.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/openshiftmanagedclusters.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/CHANGELOG.md
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/_meta.json
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationgatewayprivateendpointconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationgateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationsecuritygroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/azurefirewalls.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/bastionhosts.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/client.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/connectionmonitors.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/customipprefixes.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ddoscustompolicies.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ddosprotectionplans.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/dscpconfiguration.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitauthorizations.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitpeerings.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuits.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressrouteconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecrossconnectionpeerings.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecrossconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutegateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressrouteports.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/firewallpolicies.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/firewallpolicyrulecollectiongroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/flowlogs.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/hubroutetables.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/hubvirtualnetworkconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/inboundnatrules.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/inboundsecurityrule.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/interfacesgroup.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/interfacetapconfigurations.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ipallocations.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ipgroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/loadbalancerbackendaddresspools.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/loadbalancers.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/localnetworkgateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/natgateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/natrules.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/p2svpngateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/packetcaptures.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privatednszonegroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privateendpoints.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privatelinkservices.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/profiles.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/publicipaddresses.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/publicipprefixes.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routefilterrules.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routefilters.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routes.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routetables.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securitygroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securitypartnerproviders.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securityrules.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/serviceendpointpolicies.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/serviceendpointpolicydefinitions.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/subnets.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualappliances.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualappliancesites.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubbgpconnection.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubbgpconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubipconfiguration.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubroutetablev2s.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubs.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkgatewayconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkgateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkpeerings.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworks.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworktaps.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualrouterpeerings.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualrouters.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualwans.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpngateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnserverconfigurations.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnserverconfigurationsassociatedwithvirtualwan.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnsites.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnsitesconfiguration.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/watchers.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/webapplicationfirewallpolicies.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationgatewayprivateendpointconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationgateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationsecuritygroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/azurefirewalls.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/bastionhosts.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/client.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/connectionmonitors.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/customipprefixes.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ddoscustompolicies.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ddosprotectionplans.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/dscpconfiguration.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitauthorizations.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitpeerings.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuits.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressrouteconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecrossconnectionpeerings.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecrossconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutegateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressrouteports.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/firewallpolicies.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/firewallpolicyrulecollectiongroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/flowlogs.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/hubroutetables.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/hubvirtualnetworkconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/inboundnatrules.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/inboundsecurityrule.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/interfacesgroup.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/interfacetapconfigurations.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ipallocations.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ipgroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/loadbalancerbackendaddresspools.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/loadbalancers.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/localnetworkgateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/natgateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/natrules.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/p2svpngateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/packetcaptures.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privatednszonegroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privateendpoints.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privatelinkservices.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/profiles.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/publicipaddresses.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/publicipprefixes.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routefilterrules.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routefilters.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routes.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routetables.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securitygroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securitypartnerproviders.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securityrules.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/serviceendpointpolicies.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/serviceendpointpolicydefinitions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/subnets.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualappliances.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualappliancesites.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubbgpconnection.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubbgpconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubipconfiguration.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubroutetablev2s.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubs.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgatewayconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgatewaynatrules.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkpeerings.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworktaps.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualrouterpeerings.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualrouters.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualwans.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpngateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnlinkconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnserverconfigurations.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnserverconfigurationsassociatedwithvirtualwan.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnsites.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnsitesconfiguration.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/watchers.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/webapplicationfirewallpolicies.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/privatezones.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/virtualnetworklinks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deployments.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/groups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/resources.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/deployments.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/groups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/resources.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/accounts.go
M	vendor/github.com/Azure/azure-sdk-for-go/version/version.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/version/version.go
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/version/version.go
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/_meta.json
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/webapplicationfirewallpolicies.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/webapplicationfirewallpolicies.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/watchers.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/watchers.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnsitesconfiguration.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnsitesconfiguration.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnsites.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnsites.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnserverconfigurationsassociatedwithvirtualwan.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnserverconfigurationsassociatedwithvirtualwan.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnserverconfigurations.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnserverconfigurations.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpngateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpngateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualwans.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualwans.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualrouters.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualrouters.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualrouterpeerings.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualrouterpeerings.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworktaps.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworktaps.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworks.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworks.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkpeerings.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkpeerings.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkgateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkgateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkgatewayconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkgatewayconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubs.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubs.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubroutetablev2s.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubroutetablev2s.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubipconfiguration.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubipconfiguration.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubbgpconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubbgpconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubbgpconnection.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubbgpconnection.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualappliancesites.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualappliancesites.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualappliances.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualappliances.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/subnets.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/subnets.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/serviceendpointpolicydefinitions.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/serviceendpointpolicydefinitions.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/serviceendpointpolicies.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/serviceendpointpolicies.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securityrules.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securityrules.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securitypartnerproviders.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securitypartnerproviders.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securitygroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securitygroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routetables.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routetables.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routes.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routes.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routefilters.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routefilters.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routefilterrules.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routefilterrules.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/publicipprefixes.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/publicipprefixes.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/publicipaddresses.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/publicipaddresses.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/profiles.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/profiles.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privatelinkservices.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privatelinkservices.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privateendpoints.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privateendpoints.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privatednszonegroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privatednszonegroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/packetcaptures.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/packetcaptures.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/p2svpngateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/p2svpngateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/natrules.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/natrules.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/natgateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/natgateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/localnetworkgateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/localnetworkgateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/loadbalancers.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/loadbalancers.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/loadbalancerbackendaddresspools.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/loadbalancerbackendaddresspools.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ipgroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ipgroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ipallocations.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ipallocations.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/interfacetapconfigurations.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/interfacetapconfigurations.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/interfacesgroup.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/interfacesgroup.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/inboundsecurityrule.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/inboundsecurityrule.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/inboundnatrules.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/inboundnatrules.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/hubvirtualnetworkconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/hubvirtualnetworkconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/hubroutetables.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/hubroutetables.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/flowlogs.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/flowlogs.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/firewallpolicyrulecollectiongroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/firewallpolicyrulecollectiongroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/firewallpolicies.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/firewallpolicies.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressrouteports.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressrouteports.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutegateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutegateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecrossconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecrossconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecrossconnectionpeerings.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecrossconnectionpeerings.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressrouteconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressrouteconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuits.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuits.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitpeerings.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitpeerings.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitauthorizations.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitauthorizations.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/dscpconfiguration.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/dscpconfiguration.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ddosprotectionplans.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ddosprotectionplans.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ddoscustompolicies.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ddoscustompolicies.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/customipprefixes.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/customipprefixes.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/connectionmonitors.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/connectionmonitors.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/client.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/client.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/bastionhosts.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/bastionhosts.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/azurefirewalls.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/azurefirewalls.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationsecuritygroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationsecuritygroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationgateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationgateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationgatewayprivateendpointconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationgatewayprivateendpointconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/_meta.json deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/_meta.json left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/CHANGELOG.md deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/CHANGELOG.md left in tree.
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/_meta.json
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 13052 and retry the command.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 chore: upgrade azure-sdk-for-go to v58.2.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot
Copy link

@MartinForReal: #991 failed to apply on top of branch "release-1.23":

Applying: chore: upgrade azure-sdk-for-go to v58.2.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/Azure/azure-sdk-for-go/LICENSE.txt
M	vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/dedicatedhosts.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/diskaccesses.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/diskencryptionsets.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/diskrestorepoint.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/disks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/enums.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleries.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleryapplications.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleryapplicationversions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleryimages.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/galleryimageversions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/images.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/loganalytics.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/models.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/snapshots.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachineextensions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachineruncommands.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachines.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetextensions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetrollingupgrades.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesets.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetvmextensions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetvmruncommands.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/virtualmachinescalesetvms.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/registries.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/replications.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/runs.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/tasks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/webhooks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/agentpools.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/containerservices.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/managedclusters.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/openshiftmanagedclusters.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/CHANGELOG.md
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/_meta.json
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationgatewayprivateendpointconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationgateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationsecuritygroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/azurefirewalls.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/bastionhosts.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/client.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/connectionmonitors.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/customipprefixes.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ddoscustompolicies.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ddosprotectionplans.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/dscpconfiguration.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitauthorizations.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitpeerings.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuits.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressrouteconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecrossconnectionpeerings.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecrossconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutegateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressrouteports.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/firewallpolicies.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/firewallpolicyrulecollectiongroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/flowlogs.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/hubroutetables.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/hubvirtualnetworkconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/inboundnatrules.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/inboundsecurityrule.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/interfacesgroup.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/interfacetapconfigurations.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ipallocations.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ipgroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/loadbalancerbackendaddresspools.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/loadbalancers.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/localnetworkgateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/natgateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/natrules.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/p2svpngateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/packetcaptures.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privatednszonegroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privateendpoints.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privatelinkservices.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/profiles.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/publicipaddresses.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/publicipprefixes.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routefilterrules.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routefilters.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routes.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routetables.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securitygroups.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securitypartnerproviders.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securityrules.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/serviceendpointpolicies.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/serviceendpointpolicydefinitions.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/subnets.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualappliances.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualappliancesites.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubbgpconnection.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubbgpconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubipconfiguration.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubroutetablev2s.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubs.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkgatewayconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkgateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkpeerings.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworks.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworktaps.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualrouterpeerings.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualrouters.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualwans.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnconnections.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpngateways.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnserverconfigurations.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnserverconfigurationsassociatedwithvirtualwan.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnsites.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnsitesconfiguration.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/watchers.go
A	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/webapplicationfirewallpolicies.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationgatewayprivateendpointconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationgateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/applicationsecuritygroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/azurefirewalls.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/bastionhosts.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/client.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/connectionmonitors.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/customipprefixes.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ddoscustompolicies.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ddosprotectionplans.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/dscpconfiguration.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitauthorizations.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuitpeerings.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecircuits.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressrouteconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecrossconnectionpeerings.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutecrossconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressroutegateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/expressrouteports.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/firewallpolicies.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/firewallpolicyrulecollectiongroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/flowlogs.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/hubroutetables.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/hubvirtualnetworkconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/inboundnatrules.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/inboundsecurityrule.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/interfacesgroup.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/interfacetapconfigurations.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ipallocations.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/ipgroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/loadbalancerbackendaddresspools.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/loadbalancers.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/localnetworkgateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/natgateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/natrules.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/p2svpngateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/packetcaptures.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privatednszonegroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privateendpoints.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/privatelinkservices.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/profiles.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/publicipaddresses.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/publicipprefixes.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routefilterrules.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routefilters.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routes.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/routetables.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securitygroups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securitypartnerproviders.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/securityrules.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/serviceendpointpolicies.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/serviceendpointpolicydefinitions.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/subnets.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualappliances.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualappliancesites.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubbgpconnection.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubbgpconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubipconfiguration.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubroutetablev2s.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualhubs.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgatewayconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgatewaynatrules.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkgateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworkpeerings.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualnetworktaps.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualrouterpeerings.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualrouters.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/virtualwans.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpngateways.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnlinkconnections.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnserverconfigurations.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnserverconfigurationsassociatedwithvirtualwan.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnsites.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/vpnsitesconfiguration.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/watchers.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/webapplicationfirewallpolicies.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/privatezones.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/virtualnetworklinks.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/deployments.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/groups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/resources.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/deployments.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/groups.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/resources.go
M	vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/_meta.json
M	vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/accounts.go
M	vendor/github.com/Azure/azure-sdk-for-go/version/version.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/version/version.go
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/version/version.go
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-02-01/storage/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network/_meta.json
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/webapplicationfirewallpolicies.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/webapplicationfirewallpolicies.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/watchers.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/watchers.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnsitesconfiguration.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnsitesconfiguration.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnsites.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnsites.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnserverconfigurationsassociatedwithvirtualwan.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnserverconfigurationsassociatedwithvirtualwan.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnserverconfigurations.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnserverconfigurations.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpngateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpngateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/vpnconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualwans.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualwans.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualrouters.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualrouters.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualrouterpeerings.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualrouterpeerings.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworktaps.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworktaps.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworks.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworks.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkpeerings.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkpeerings.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkgateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkgateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkgatewayconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualnetworkgatewayconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubs.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubs.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubroutetablev2s.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubroutetablev2s.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubipconfiguration.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubipconfiguration.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubbgpconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubbgpconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubbgpconnection.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualhubbgpconnection.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualappliancesites.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualappliancesites.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualappliances.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/virtualappliances.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/subnets.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/subnets.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/serviceendpointpolicydefinitions.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/serviceendpointpolicydefinitions.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/serviceendpointpolicies.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/serviceendpointpolicies.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securityrules.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securityrules.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securitypartnerproviders.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securitypartnerproviders.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securitygroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/securitygroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routetables.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routetables.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routes.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routes.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routefilters.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routefilters.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routefilterrules.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/routefilterrules.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/publicipprefixes.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/publicipprefixes.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/publicipaddresses.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/publicipaddresses.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/profiles.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/profiles.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privatelinkservices.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privatelinkservices.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privateendpoints.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privateendpoints.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privatednszonegroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/privatednszonegroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/packetcaptures.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/packetcaptures.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/p2svpngateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/p2svpngateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/natrules.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/natrules.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/natgateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/natgateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/localnetworkgateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/localnetworkgateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/loadbalancers.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/loadbalancers.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/loadbalancerbackendaddresspools.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/loadbalancerbackendaddresspools.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ipgroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ipgroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ipallocations.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ipallocations.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/interfacetapconfigurations.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/interfacetapconfigurations.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/interfacesgroup.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/interfacesgroup.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/inboundsecurityrule.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/inboundsecurityrule.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/inboundnatrules.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/inboundnatrules.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/hubvirtualnetworkconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/hubvirtualnetworkconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/hubroutetables.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/hubroutetables.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/flowlogs.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/flowlogs.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/firewallpolicyrulecollectiongroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/firewallpolicyrulecollectiongroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/firewallpolicies.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/firewallpolicies.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressrouteports.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressrouteports.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutegateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutegateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecrossconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecrossconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecrossconnectionpeerings.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecrossconnectionpeerings.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressrouteconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressrouteconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuits.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuits.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitpeerings.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitpeerings.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitauthorizations.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/expressroutecircuitauthorizations.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/dscpconfiguration.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/dscpconfiguration.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ddosprotectionplans.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ddosprotectionplans.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ddoscustompolicies.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/ddoscustompolicies.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/customipprefixes.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/customipprefixes.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/connectionmonitors.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/connectionmonitors.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/client.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/client.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/bastionhosts.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/bastionhosts.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/azurefirewalls.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/azurefirewalls.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationsecuritygroups.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationsecuritygroups.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationgateways.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationgateways.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationgatewayprivateendpointconnections.go deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/applicationgatewayprivateendpointconnections.go left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/_meta.json deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/_meta.json left in tree.
CONFLICT (modify/delete): vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/CHANGELOG.md deleted in HEAD and modified in chore: upgrade azure-sdk-for-go to v58.2.0. Version chore: upgrade azure-sdk-for-go to v58.2.0 of vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network/CHANGELOG.md left in tree.
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2019-05-01/containerregistry/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute/_meta.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/_meta.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization/_meta.json
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 13222 and retry the command.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 chore: upgrade azure-sdk-for-go to v58.2.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.23

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

This was referenced Apr 12, 2022
Merged
Merged
k8s-ci-robot added a commit that referenced this pull request Apr 12, 2022
@k8s-ci-robot
Merge pull request #1463 from MartinForReal/release-1.1-backport
11d0cf4 
[release-1.1] backport #1235 #991 #1084 to release-1.1
k8s-ci-robot added a commit that referenced this pull request Apr 12, 2022
@k8s-ci-robot
Merge pull request #1460 from MartinForReal/release-1.23-backport
4705197 
[release-1.23] backport #1235  #991 #1084 to release-1.23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ZeroMagic ZeroMagic ZeroMagic approved these changes

@feiskyer feiskyer Awaiting requested review from feiskyer

@nilo19 nilo19 Awaiting requested review from nilo19

Assignees

@ZeroMagic ZeroMagic

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@andyzhangx @coveralls @k8s-ci-robot @MartinForReal @k8s-infra-cherrypick-robot @ZeroMagic