You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@ozone.apache.org by "Aravindan Vijayan (Jira)" <ji...@apache.org> on 2021/02/09 18:15:00 UTC
[jira] [Resolved] (HDDS-4587) Merge master into HDDS-3698-upgrade
branch.
[ https://issues.apache.org/jira/browse/HDDS-4587?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Aravindan Vijayan resolved HDDS-4587.
-------------------------------------
Resolution: Fixed
Merge is done.
> Merge master into HDDS-3698-upgrade branch.
> -------------------------------------------
>
> Key: HDDS-4587
> URL: https://issues.apache.org/jira/browse/HDDS-4587
> Project: Apache Ozone
> Issue Type: Sub-task
> Reporter: Aravindan Vijayan
> Assignee: Prashant Pogde
> Priority: Major
> Labels: pull-request-available
>
> Seeing some conflicts on attempted merge.
> {code}
> CONFLICT (content): Merge conflict in hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java
> Removing hadoop-ozone/dist/src/main/smoketest/freon/freon.robot
> Auto-merging hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
> CONFLICT (content): Merge conflict in hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
> Auto-merging hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/scm/node/TestSCMNodeMetrics.java
> CONFLICT (content): Merge conflict in hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/scm/node/TestSCMNodeMetrics.java
> Auto-merging hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
> CONFLICT (content): Merge conflict in hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
> Auto-merging hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
> CONFLICT (content): Merge conflict in hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
> Auto-merging hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
> Auto-merging hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
> Auto-merging hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
> Auto-merging hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
> CONFLICT (content): Merge conflict in hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
> Auto-merging hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
> Auto-merging hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/NodeStateMap.java
> CONFLICT (content): Merge conflict in hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/NodeStateMap.java
> Auto-merging hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeMetrics.java
> CONFLICT (content): Merge conflict in hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeMetrics.java
> Auto-merging hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
> CONFLICT (content): Merge conflict in hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
> Auto-merging hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
> CONFLICT (content): Merge conflict in hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
> Auto-merging hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
> Auto-merging hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeInfo.java
> CONFLICT (content): Merge conflict in hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeInfo.java
> Auto-merging hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/events/SCMEvents.java
> Auto-merging hadoop-hdds/interface-server/src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto
> CONFLICT (content): Merge conflict in hadoop-hdds/interface-server/src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto
> Auto-merging hadoop-hdds/interface-client/src/main/proto/hdds.proto
> CONFLICT (content): Merge conflict in hadoop-hdds/interface-client/src/main/proto/hdds.proto
> Auto-merging hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/HeartbeatEndpointTask.java
> CONFLICT (content): Merge conflict in hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/HeartbeatEndpointTask.java
> Auto-merging hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java
> CONFLICT (content): Merge conflict in hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java
> Automatic merge failed; fix conflicts and then commit the result.
> {code}
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@ozone.apache.org
For additional commands, e-mail: issues-help@ozone.apache.org