Skip to content

Cherry pick #73924 to 25.1: Propagate Native format settings properly for client-server communication#75611

Merged
robot-ch-test-poll2 merged 6 commits intobackport/25.1/73924from
cherrypick/25.1/73924
Feb 5, 2025
Merged

Cherry pick #73924 to 25.1: Propagate Native format settings properly for client-server communication#75611
robot-ch-test-poll2 merged 6 commits intobackport/25.1/73924from
cherrypick/25.1/73924

Conversation

@robot-ch-test-poll2
Copy link
Copy Markdown
Contributor

Original pull-request #73924

This pull-request is a first step of an automated backporting.
It contains changes similar to calling git cherry-pick locally.
If you intend to continue backporting the changes, then resolve all conflicts if any.
Otherwise, if you do not want to backport them, then just close this pull-request.

The check results does not matter at this step - you can safely ignore them.

Note

This pull-request will be merged automatically. Please, do not merge it manually (but if you accidentally did, nothing bad will happen).

Troubleshooting

If the PR was manually reopened after being closed

If this PR is stuck (i.e. not automatically merged after one day), check #73924 for pr-backports-created label and delete it.

Manually merging will do nothing. The pr-backports-created label prevents the original PR #73924 from being processed.

If the conflicts were resolved in a wrong way

If this cherry-pick PR is completely screwed by a wrong conflicts resolution, and you want to recreate it:

  • delete the pr-cherrypick label from the PR
  • delete this branch from the repository

You also need to check the original PR #73924 for pr-backports-created, and delete if it's presented there

@robot-ch-test-poll2 robot-ch-test-poll2 added pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only! do not test disable testing on pull request pr-bugfix Pull request with bugfix, not backported by default labels Feb 5, 2025
@robot-ch-test-poll2 robot-ch-test-poll2 merged commit 4bc70dc into backport/25.1/73924 Feb 5, 2025
43 checks passed
@robot-ch-test-poll2 robot-ch-test-poll2 deleted the cherrypick/25.1/73924 branch February 5, 2025 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do not test disable testing on pull request pr-bugfix Pull request with bugfix, not backported by default pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants