[HDFS-7936] Erasure coding: resolving conflicts in the branch when merging trunk changes.

• Type: Sub-task
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Fix Version/s: HDFS-7285
• Hadoop Flags: Reviewed
• Assignee: Zhe Zhang
• Reporter: Zhe Zhang
• Created: 16/Mar/15 21:07
• Updated: 30/Sep/15 19:38
• Resolved: 16/Mar/15 21:28

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

1. HDFS-7903
2. HDFS-7435
3. HDFS-7930
4. HDFS-7960
5. HDFS-7742
6. HDFS-8035
7. HDFS-8169
8. HDFS-8327
9. HDFS-8357