HDDS-16116. Merge recent commits from master to HDDS-11233. - #11127
Closed
devmadhuu wants to merge 734 commits into
Closed
HDDS-16116. Merge recent commits from master to HDDS-11233.#11127devmadhuu wants to merge 734 commits into
devmadhuu wants to merge 734 commits into
Conversation
… on an HA cluster (apache#10699)
…he#10209) Generated-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…h or return block locations (apache#10741)
…n be deleted by SCM and recreated as new partial OPEN container (apache#10702)
…registry. (apache#10770) Generated-by: Cursor
…che#10648) Co-authored-by: Wei-Chiu Chuang <jojochuang@gmail.com>
…p in PipelineStateMap (apache#10454) Co-authored-by: Tsz-Wo Nicholas Sze <szetszwo@apache.org>
…ible gateways). (apache#10805). Co-authored-by: Cursor <cursoragent@cursor.com>
…or out-of-range parts (apache#10670).
…balancer status -v (apache#10938)
…xtend MessageUnmarshaller (apache#11075)
…n OMLockMetrics and PerformanceMetrics (apache#11085) Generated-by: Claude Opus 4.8
…TestFailureHandlingByClient (apache#11065)
Contributor
Author
|
The 24 files with actual merge conflicts were: Four additional files required compatibility changes because the automatically merged code combined incompatible APIs, although Git did not mark them as conflicts: |
devmadhuu
marked this pull request as draft
August 27, 2026 02:23
devmadhuu
marked this pull request as ready for review
August 27, 2026 06:07
Contributor
Author
|
@xichen01 @ashishkumar50 @ChenSammi Kindly have a look, This is fresh PR for merge of master commits into upstream feature branch of storage policy. This PR is only for review. Once review is okay, then we can do git push to feature branch . CI is green after few merge conflicts being resolved and mentioned here the list of conflicts. Few tests cases being fixed during merge conflicts. |
Contributor
|
LGTM +1 |
Contributor
Author
|
Closing the PR now as review is completed. Thanks @xichen01 @ashishkumar50 @ChenSammi for the review. git push completed for master commits to storage policy feature branch |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Merge recent commits from master into the HDDS-11233 feature branch to keep it in sync with mainline. This brings the branch up to date with master and reconciles the StorageTier feature commits with recent master changes.
The feature branch's original commit history is preserved (first-parent), with a single Merge remote-tracking branch 'upstream/master' into HDDS-11233 commit on top.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-16116
How was this patch tested?
Depending on CI status as green.