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

Merge branch 'trunk' into HDFS-7240 hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/09517262/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml -- diff --cc hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml index

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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/db22affd/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java -- diff --cc

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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/16440b83/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/storagecontainer/StorageContainerManager.java -- diff --cc

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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/312d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java -- diff --cc

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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/28d313d1/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/storagecontainer/StorageContainerMap.java -- diff --cc