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/bfc7b7e6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bfc7b7e6
Diff:
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/09dab88d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/09dab88d
Diff:
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/24f81568
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/24f81568
Diff: