[1/2] hadoop git commit: Merge branch 'trunk' into hdfs-7240

2015-11-04 Thread aengineer
Repository: hadoop Updated Branches: refs/heads/hdfs-7240 [created] 312de 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

[1/2] hadoop git commit: Merge branch 'trunk' into hdfs-7240

2015-07-28 Thread aengineer
Repository: hadoop Updated Branches: refs/heads/hdfs-7240 [created] be57a1345 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/6b3866d5 Tree: