[
https://issues.apache.org/jira/browse/HDFS-7936?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Zhe Zhang updated HDFS-7936:
----------------------------
Attachment: HDFS-7936-002.patch
001 patch had unnecessary changes to import
> 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: Jing Zhao
> 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)
