This is an automated email from the ASF dual-hosted git repository. umamahesh pushed a commit to branch HDDS-3816-ec in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 27f57b7d3cd9555905c1f4622bb666747cdfefbd Author: Uma Maheswara Rao G <[email protected]> AuthorDate: Thu Jun 24 09:44:49 2021 -0700 Fixed conflict issue as part of merge branch 'master' into EC branch. --- .../main/java/org/apache/hadoop/hdds/scm/container/ContainerInfo.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerInfo.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerInfo.java index f506c74..d4555b1 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerInfo.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerInfo.java @@ -230,8 +230,6 @@ public class ContainerInfo implements Comparator<ContainerInfo>, ReplicationConfig.getLegacyFactor(replicationConfig)); } - builder.setReplicationFactor( - ReplicationConfig.getLegacyFactor(replicationConfig)); builder.setReplicationType(replicationConfig.getReplicationType()); if (getPipelineID() != null) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
