[
https://issues.apache.org/jira/browse/HDFS-9997?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Vinayakumar B deleted HDFS-9997:
--------------------------------
> CLONE - Erasure coding: resolving conflicts in the branch when merging trunk
> changes.
> --------------------------------------------------------------------------------------
>
> Key: HDFS-9997
> URL: https://issues.apache.org/jira/browse/HDFS-9997
> Project: Hadoop HDFS
> Issue Type: Sub-task
> Reporter: dragon
> Assignee: Zhe Zhang
> Fix For: HDFS-7285
>
>
> 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
> # HDFS-8169
> # HDFS-8327
> # HDFS-8357
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
