Merge branch 'trunk' into HDFS-6581
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d9639662
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d9639662
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d9639662
Merge branch 'trunk' into HDFS-6581
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/22295b47
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/22295b47
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/22295b47