HDDS-9152. Part of HDDS-7240 is missing due to incorrect conflict resolution #5172
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
smengcl
added
bug
kerneltime
approved these changes
Aug 11, 2023
Contributor
Author
|
Thanks @kerneltime for reviewing and merging this. |
jojochuang
pushed a commit
to jojochuang/ozone
that referenced
this pull request
Oct 24, 2023
…conflict resolution (apache#5172) (cherry picked from commit 0a58f71) Change-Id: I6560079df4ca4d1d351500ac3ddfc267231dfa1f
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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?
Part of HDDS-7240 (#3770) unfortunately got lost during a previous conflict resolution.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-9152
How was this patch tested?