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/5a5a7da3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5a5a7da3
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/6e5f780d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6e5f780d
Diff:
Merge branch 'trunk' into HDFS-6581
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: