Skip to content

Conversation

@ydbot
Copy link
Collaborator

@ydbot ydbot commented Dec 14, 2025

Changelog entry

remove legacy multiple tablets reassign http api

Changelog category

  • Not for changelog (changelog entry is not required)

Description for reviewers

Original PR(s)

Metadata

Conflicts Require Manual Resolution

This PR contains merge conflicts that require manual resolution.

Files with conflicts:

How to resolve conflicts:

git fetch origin
git checkout --track origin/cherry-pick-stable-25-2-251214-153433
# Resolve conflicts in files
git add .
git commit -m "Resolved merge conflicts"
git push

After resolving conflicts:

  1. Fix the PR title (remove [CONFLICT] if conflicts are resolved)
  2. Mark PR as ready for review

Git Cherry-Pick Log

=== Cherry-picking 3dc0eba ===
Auto-merging ydb/core/mind/hive/monitoring.cpp
CONFLICT (content): Merge conflict in ydb/core/mind/hive/monitoring.cpp

error: could not apply 3dc0eba1e0e... remove legacy multiple tablets reassign http api (#29554)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

PR was created by cherry-pick workflow run

@github-actions
Copy link

github-actions bot commented Dec 14, 2025

🟢 2025-12-14 15:37:56 UTC The validation of the Pull Request description is successful.

@ydbot
Copy link
Collaborator Author

ydbot commented Dec 14, 2025

Run Extra Tests

Run additional tests for this PR. You can customize:

  • Test Size: small, medium, large (default: all)
  • Test Targets: any directory path (default: ydb/)
  • Sanitizers: ASAN, MSAN, TSAN
  • Coredumps: enable for debugging (default: off)
  • Additional args: custom ya make arguments

▶  Run tests

@github-actions
Copy link

github-actions bot commented Dec 14, 2025

2025-12-14 15:38:26 UTC Pre-commit check linux-x86_64-relwithdebinfo for a387df6 has started.
2025-12-14 15:38:42 UTC Artifacts will be uploaded here
2025-12-14 15:41:37 UTC ya make is running...
🔴 2025-12-14 15:44:34 UTC Build failed, see the logs. Also see fail summary

@github-actions
Copy link

github-actions bot commented Dec 14, 2025

2025-12-14 15:38:33 UTC Pre-commit check linux-x86_64-release-asan for a387df6 has started.
2025-12-14 15:38:47 UTC Artifacts will be uploaded here
2025-12-14 15:41:44 UTC ya make is running...
🔴 2025-12-14 15:45:00 UTC Build failed, see the logs. Also see fail summary

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants