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 "Zhe Zhang (JIRA)" <ji...@apache.org> on 2015/05/11 21:22:00 UTC
[jira] [Updated] (HDFS-7936) Erasure coding: resolving conflicts in
the branch when merging trunk changes.
[ https://issues.apache.org/jira/browse/HDFS-7936?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Zhe Zhang updated HDFS-7936:
----------------------------
Description:
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
was:
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
> Erasure coding: resolving conflicts in the branch when merging trunk changes.
> ------------------------------------------------------------------------------
>
> 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
> # HDFS-8169
> # HDFS-8327
> # HDFS-8357
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)