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(vendor): update dependencies (backport #634) #636

Merged
merged 2 commits into from
Aug 26, 2024
Merged

chore(vendor): update dependencies (backport #634) #636

merged 2 commits into from
Aug 26, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 23, 2024

Which issue(s) this PR fixes:

Issue # longhorn/longhorn#9281

What this PR does / why we need it:

Special notes for your reviewer:

Additional documentation or context

This is an automatic backport of pull request #634 done by [Mergify](https://mergify.com).

@mergify Mergify
Copy link
Author

mergify bot commented Aug 23, 2024

Cherry-pick of 7d9aee1 has failed:

On branch mergify/bp/v1.6.x/pr-634
Your branch is up to date with 'origin/v1.6.x'.

You are currently cherry-picking commit 7d9aee1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/CHANGELOG.md
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/ci.yml
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud/cloud.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud/doc.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/core.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/doc.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/errors.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/etag.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/exported/exported.go
	renamed:    vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/pipeline/pipeline.go -> vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/exported/pipeline.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/exported/request.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/exported/response_error.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/log/log.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/pipeline/request.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/pollers/async/async.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/pollers/body/body.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/pollers/fake/fake.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/pollers/loc/loc.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/pollers/op/op.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/pollers/poller.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/pollers/util.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/constants.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/response_error.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/shared.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/log/doc.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/log/log.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/policy/doc.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/policy/policy.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/doc.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/errors.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/pager.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/pipeline.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_api_version.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_bearer_token.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_body_download.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_http_header.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_http_trace.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_include_response.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_key_credential.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_logging.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_request_id.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_retry.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_sas_credential.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_telemetry.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/poller.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/request.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/response.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/transport_default_dialer_other.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/transport_default_dialer_wasm.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/transport_default_http_client.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/streaming/doc.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/streaming/progress.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/to/doc.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/to/to.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/tracing/constants.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/tracing/tracing.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/diag/diag.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/diag/doc.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/errorinfo/doc.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/errorinfo/errorinfo.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/exported/exported.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/log/doc.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/log/log.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/poller/util.go
	renamed:    vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/expiring_resource.go -> vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/temporal/resource.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/uuid/doc.go
	modified:   vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/uuid/uuid.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/CHANGELOG.md
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/README.md
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/appendblob/client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/appendblob/models.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/appendblob/responses.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob/client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob/constants.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob/models.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob/responses.go
	renamed:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_retry_reader.go -> vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob/retry_reader.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob/utils.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror/error_codes.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob/chunkwriting.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob/client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob/constants.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob/models.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob/responses.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/chunkwriting.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/ci.yml
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/constants.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container/batch_builder.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container/client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container/constants.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container/models.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container/responses.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/doc.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/highlevel.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/base/clients.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported/access_conditions.go
	renamed:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_access_policy.go -> vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported/access_policy.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported/blob_batch.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported/exported.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported/log_events.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported/set_expiry.go
	renamed:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_shared_policy_shared_key_credential.go -> vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported/shared_key_credential.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported/transfer_validation_option.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported/user_delegation_credential.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported/version.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/appendblob_client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/autorest.md
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/blob_client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/block_blob_client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/build.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/constants.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/container_client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/models.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/pageblob_client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/service_client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/zz_appendblob_client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/zz_blob_client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/zz_blockblob_client.go
	renamed:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_constants.go -> vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/zz_constants.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/zz_container_client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/zz_models.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/zz_models_serde.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/zz_options.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/zz_pageblob_client.go
	renamed:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_response_types.go -> vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/zz_responses.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/zz_service_client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/zz_time_rfc1123.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/zz_time_rfc3339.go
	renamed:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_xml_helper.go -> vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated/zz_xml_helper.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared/batch_transfer.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared/buffer_manager.go
	renamed:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bytes_writer.go -> vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared/bytes_writer.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared/challenge_policy.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared/mmf_unix.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared/mmf_windows.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared/section_writer.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared/shared.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/zc_shared.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/pageblob/client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/pageblob/constants.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/pageblob/models.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/pageblob/responses.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas/account.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas/query_params.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas/service.go
	renamed:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_parsing_urls.go -> vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas/url_parts.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/section_writer.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service/batch_builder.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service/client.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service/constants.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service/models.go
	new file:   vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service/responses.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/version.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_append_blob_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_blob_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_blob_lease_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_block_blob_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_connection_string.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_container_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_container_lease_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_page_blob_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_response_error.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_response_helpers.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_sas_account.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_sas_query_params.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_sas_service.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_service_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_storage_error.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zc_validators.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zm_access_conditions.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zm_append_blob_request_options.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zm_blob_request_options.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zm_block_blob_request_options.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zm_client_options.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zm_container_request_options.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zm_lease_request_options.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zm_page_blob_request_options.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zm_service_request_options.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zu_serialize_and_desearilize.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_appendblob_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_blob_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_blockblob_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_connection.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_container_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_directory_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_models.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_pageblob_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_pagers.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_service_client.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_time_rfc1123.go
	deleted:    vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/zz_generated_time_rfc3339.go
	modified:   vendor/github.com/aws/aws-sdk-go/aws/request/waiter.go
	modified:   vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/ssooidc/errors.go
	modified:   vendor/github.com/longhorn/backupstore/azblob/azblob.go
	modified:   vendor/github.com/longhorn/backupstore/azblob/azblob_service.go
	modified:   vendor/github.com/longhorn/longhorn-engine/pkg/replica/diff_disk.go
	modified:   vendor/github.com/longhorn/longhorn-engine/pkg/replica/extents.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
	both modified:   vendor/github.com/aws/aws-sdk-go/aws/version.go
	both modified:   vendor/github.com/aws/aws-sdk-go/service/s3/api.go
	both modified:   vendor/github.com/aws/aws-sdk-go/service/ssooidc/api.go
	both modified:   vendor/github.com/longhorn/longhorn-engine/pkg/replica/replica.go
	both modified:   vendor/modules.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from a team as a code owner August 23, 2024 04:44
@mergify mergify bot added the conflicts label Aug 23, 2024
@mergify mergify bot mentioned this pull request Aug 23, 2024
Merged
@mantissahz
Copy link
Contributor

mantissahz commented Aug 23, 2024 •
edited
Loading

Solving the conflicts and waiting for longhorn/longhorn-engine#1196 merged.

@mantissahz
chore(vendor): update dependencies
9e67536 
ref: longhorn/longhorn 9281

Signed-off-by: James Lu <james.lu@suse.com>
(cherry picked from commit 7d9aee1)
@derekbit @mantissahz
Remove deprecated grpc.Dial use, replace with grpc.NewClient
4c92d9e 
Signed-off-by: Derek Su <derek.su@suse.com>
@mantissahz mantissahz self-assigned this Aug 23, 2024
@mantissahz mantissahz mentioned this pull request Aug 23, 2024
Closed
4 tasks
derekbit
derekbit approved these changes Aug 26, 2024
View reviewed changes
Copy link
Member

@derekbit derekbit left a comment

Choose a reason for hiding this comment

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

LGTM

@derekbit derekbit merged commit 012cacf into v1.6.x Aug 26, 2024
8 checks passed
@derekbit derekbit deleted the mergify/bp/v1.6.x/pr-634 branch August 26, 2024 12:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@derekbit derekbit derekbit approved these changes

Assignees

@mantissahz mantissahz

Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mantissahz @derekbit