Arpit Agarwal created HDFS-7091: ----------------------------------- Summary: Prepare branch for merging with HDFS-6584 Key: HDFS-7091 URL: https://issues.apache.org/jira/browse/HDFS-7091 Project: Hadoop HDFS Issue Type: Sub-task Affects Versions: HDFS-6581 Reporter: Arpit Agarwal Assignee: Arpit Agarwal
Since HDFS-6584 is in trunk we are hitting quite a few merge conflicts. Many of the conflicts can be avoided by some minor updates to the branch. -- This message was sent by Atlassian JIRA (v6.3.4#6332)