[
https://issues.apache.org/jira/browse/HDFS-7936?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14363949#comment-14363949
]
Jing Zhao commented on HDFS-7936:
---------------------------------
Hi Zhe, let me know if you need any help on 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
> Attachments: HDFS-7936-001.patch
>
>
> A few non-trivial conflicts were found when merging trunk changes.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
