[ https://issues.apache.org/jira/browse/HDFS-7936?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Jing Zhao resolved HDFS-7936. ----------------------------- Resolution: Fixed Fix Version/s: HDFS-7285 Hadoop Flags: Reviewed I've committed this. > Erasure coding: resolving conflicts when merging with HDFS-7903 and HDFS-7435 > ----------------------------------------------------------------------------- > > 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 > > > A few non-trivial conflicts were found when merging trunk changes. -- This message was sent by Atlassian JIRA (v6.3.4#6332)