jojochuang opened a new pull request, #6824:
URL: https://github.com/apache/ozone/pull/6824
## What changes were proposed in this pull request?
HDDS-11016. [hsync] 7th merge from master
Please describe your PR in detail:
* Merge the last three weeks of commits from master branch.
* The following is the code conflict analysis.
HDDS-9918
both modified:
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
HDDS-10925
both modified:
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java
HDDS-10934
both modified:
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java
HDDS-10572
both modified:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeysDeleteRequest.java
both modified:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OmKeysDeleteRequestWithFSO.java
## What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-11016
## How was this patch tested?
Unit tests
--
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]
