[ https://issues.apache.org/jira/browse/HDFS-7936?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Kai Zheng updated HDFS-7936: ---------------------------- Description: This will be used to track and resolve conflicts when merging trunk changes. (was: A few non-trivial conflicts were found when merging trunk changes. ) > Erasure coding: resolving conflicts in the branch when merging > -------------------------------------------------------------- > > Key: HDFS-7936 > URL: https://issues.apache.org/jira/browse/HDFS-7936 > Project: Hadoop HDFS > Issue Type: Sub-task > Reporter: Zhe Zhang > Assignee: Zhe Zhang > Fix For: HDFS-7285 > > Attachments: HDFS-7936-001.patch, HDFS-7936-002.patch, > HDFS-7936-003.patch, HDFS-7936-004.patch > > > This will be used to track and resolve conflicts when merging trunk changes. -- This message was sent by Atlassian JIRA (v6.3.4#6332)