adoroszlai commented on PR #8348:
URL: https://github.com/apache/ozone/pull/8348#issuecomment-2838867496
@chiacyu do not cherry-pick commits from `master`, rather take your latest
commit prior to the conflict, merge `master` into your branch and then apply
the commit that "Removed the leftovers":
```
git reset --hard b6b4c192a2e01d41199c6b9300d9cd5a484f3d65
git merge --no-edit origin/master
git cherry-pick e1f824fb7268e0a6ed8c2172aaa0e39ea1f78828
```
You'll also need a fix for checkstyle:
```diff
diff --git
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java
index a8d3e6b62b..2466614d43 100644
---
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java
+++
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java
@@ -29,7 +29,6 @@
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import java.util.concurrent.TimeUnit;
import org.apache.hadoop.hdds.client.ReplicationFactor;
import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
```
--
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]
