[
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-005.patch
This is to resolve conflicts with HDFS-8035
> 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, HDFS-7936-005.patch
>
>
> This will be used to track and resolve conflicts when merging trunk changes.
> Below is a list of trunk changes that have caused conflicts (updated weekly):
> # HDFS-7903
> # HDFS-7435
> # HDFS-7930
> # HDFS-7960
> # HDFS-7742
> # HDFS-8035
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
