adoroszlai commented on PR #5516: URL: https://github.com/apache/ozone/pull/5516#issuecomment-1837978644
Thanks @ronitsanan for continuing work on this. Checkstyle can be run locally very easily and quickly, so you don't need to wait for CI to report problems: ``` hadoop-ozone/dev-support/checks/checkstyle.sh ``` Also, please merge `master` into your branch as there is some conflict. Assuming `apache/ozone` remote repo is named `origin` locally: ``` git fetch --all git merge origin/master # edit conflicting files: # hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java # hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java # hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconNodeManager.java # hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconPipelineManager.java # check if it still compiles: mvn -DskipTests -DskipShade clean package # finish merge: git add -u 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]
