[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/df3ff904 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/df3ff904 Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Conflicts: dev-support/bin/dist-layout-stitching Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/78d94acd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/78d94acd Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b2b043ef Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b2b043ef Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5f16cdbd Tree:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f21b3a5b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f21b3a5b Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 hadoop-common-project/hadoop-common/src/main/resources/core-default.xml Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/19f7f875 Tree:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Conflicts: hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml hadoop-hdfs-project/hadoop-hdfs/pom.xml hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs hadoop-project/pom.xml

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b3a7f3b2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b3a7f3b2 Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Conflicts: hadoop-common-project/hadoop-common/src/main/conf/log4j.properties hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/RemoteWasbAuthorizerImpl.java Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/adc65104 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/adc65104 Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/09517262 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/09517262 Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/pom.xml hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerLocationManagerImpl.java

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a9e45ed3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a9e45ed3 Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/595257e3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/595257e3 Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1dc5c7eb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1dc5c7eb Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/db22affd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/db22affd Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/23923086 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/23923086 Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/76279f58 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/76279f58 Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3f62ba55 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3f62ba55 Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e7a7fd5e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e7a7fd5e Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into hdfs-7240

Merge branch 'trunk' into hdfs-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/312d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/312d Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/28d313d1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/28d313d1 Diff:

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-7240

Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8a070ee4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8a070ee4 Diff: