[
https://issues.apache.org/jira/browse/HDFS-7936?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14376553#comment-14376553
]
Zhe Zhang commented on HDFS-7936:
---------------------------------
Thanks Jing! I just pushed the rebased branch. There seem to be non-trivial
conflicts in every weekly rebase. I'll just reuse this JIRA for this purpose.
> Erasure coding: resolving conflicts when merging with HDFS-7903, HDFS-7435
> and HDFS-7930
> ----------------------------------------------------------------------------------------
>
> 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
>
>
> A few non-trivial conflicts were found when merging trunk changes.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
