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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/df3ff904
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:
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b2b043ef
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: http://git-wip-us.apache.org
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f21b3a5b
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: http://git-wip-us.apache.org/repos/asf/hadoo
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
hadoop-yarn-project/hadoop-y
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b3a7f3b2
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
Commit:
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/adc65104
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/09517262
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
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/a
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a9e45ed3
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/595257e3
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1dc5c7eb
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/db22affd
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/23923086
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/76279f58
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3f62ba55
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
hadoop
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e7a7fd5e
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/312d
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/28d313d1
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: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8a070ee4
24 matches
Mail list logo