adoroszlai commented on PR #5559: URL: https://github.com/apache/ozone/pull/5559#issuecomment-1803218416
Thanks @VarshaRaviCV for updating the patch. There is a conflict with `master` that needs to be resolved manually, something like: ``` git fetch origin git checkout HDDS-9496 git merge origin/master # manually edit hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketDeleteRequest.java git add hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketDeleteRequest.java git merge --continue ``` -- 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]
