HDDS-10678. [hsync] 4th Merge recent commits from master #6511
Conversation
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
Co-authored-by: Tsz-Wo Nicholas Sze <[email protected]>
… path for listKeys (apache#6195)
Co-authored-by: Ritesh H Shukla <[email protected]>
… dashboard (apache#6183) Co-authored-by: tanvipenumudy <[email protected]>
…6189) Co-authored-by: ashishk <[email protected]>
…6189) Co-authored-by: ashishk <[email protected]> (cherry picked from commit 370b9d7)
Co-authored-by: ashishk <[email protected]>
…missioning datanode (apache#6185)
Co-authored-by: Ritesh H Shukla <[email protected]>
This reverts commit ccaaf57. Reason for revert: intermittent test failures (HDDS-10654)
…top. (apache#6478) Co-authored-by: ashishk <[email protected]>
… instead of absolute path (apache#6414)
…greater than 0 bytes (apache#6447)
Conflicts: hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/RootedOzoneFileSystem.java Change-Id: I3dd100582af78089c25b73deef3a53ff963ef73e
Contributor
|
I guess it is "round 4", and does not have anything to do with PR 4, which |
jojochuang
changed the title
Contributor
Author
|
Thanks @adoroszlai Updated summary. |
smengcl
approved these changes
Apr 11, 2024
Contributor
smengcl
left a comment
smengcl
left a comment
There was a problem hiding this comment.
Thanks @jojochuang for doing the merge. lgtm. Pls push from local.
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 commits (74 in total) from master in the recent 2 weeks.
Conflicts are trivial.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-10678
How was this patch tested?
Existing tests all passed.