Details
Description
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.
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.