smengcl opened a new pull request, #6419: URL: https://github.com/apache/ozone/pull/6419
DO NOT merge this directly from GitHub, which will result in an undesired squash commit. Pushing this branch from local will automatically mark this PR as merged. ## What changes were proposed in this pull request? Resolve conflicts brought by new commits on master branch. Especially: - HDDS-5865 (https://github.com/apache/ozone/pull/6408) ## What is the link to the Apache JIRA https://issues.apache.org/jira/browse/HDDS-10565 ## How was this patch tested? - All existing tests should pass. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
