ashishkumar50 opened a new pull request, #7027: URL: https://github.com/apache/ozone/pull/7027
## What changes were proposed in this pull request? Merge recent commits from master to feature branch HDDS-7593. Below are the conflict files: ``` hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/audit/OMAction.java hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMDirectoriesPurgeRequestWithFSO.java hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java ``` Above conflicts are due to [HDDS-11194](https://issues.apache.org/jira/browse/HDDS-11194), [HDDS-10658](https://issues.apache.org/jira/browse/HDDS-10658), [HDDS-11215](https://issues.apache.org/jira/browse/HDDS-11215) ## What is the link to the Apache JIRA https://issues.apache.org/jira/browse/HDDS-11275 ## How was this patch tested? CI: https://github.com/ashishkumar50/ozone/actions/runs/10235469809/workflow -- 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: issues-unsubscr...@ozone.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@ozone.apache.org For additional commands, e-mail: issues-h...@ozone.apache.org
