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

Posted to hdfs-issues@hadoop.apache.org by "Jing Zhao (JIRA)" <ji...@apache.org> on 2015/03/23 21:12:52 UTC

[jira] [Commented] (HDFS-7936) Erasure coding: resolving conflicts when merging with HDFS-7903, HDFS-7435 and HDFS-7930

    [ https://issues.apache.org/jira/browse/HDFS-7936?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14376546#comment-14376546 ] 

Jing Zhao commented on HDFS-7936:
---------------------------------

Thanks for resolving the conflicts, Zhe! The 003 patch looks good to me. +1.

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