You are viewing a plain text version of this content. The canonical link for it is here.

Posted to hdfs-dev@hadoop.apache.org by "Kai Sasaki (JIRA)" <ji...@apache.org> on 2016/03/15 10:04:33 UTC

[jira] [Resolved] (HDFS-9997) CLONE - Erasure coding: resolving conflicts in the branch when merging trunk changes.

     [ https://issues.apache.org/jira/browse/HDFS-9997?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Kai Sasaki resolved HDFS-9997.
------------------------------
    Resolution: Invalid

> 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)