Revision 1576036

Jump to revision:
Author:	wheat9
Date:	Mon Mar 10 18:18:52 2014 UTC (10 years, 7 months ago)
Changed paths:	3
Log Message:	Merge r1576035 from trunk.

Changed paths

Path	Details
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt	modified , text changed
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSNNTopology.java	modified , text changed
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDeleteBlockPool.java	modified , text changed