Revision 1574794

Jump to revision:
Author:	wheat9
Date:	Thu Mar 6 08:16:12 2014 UTC (10 years, 7 months ago)
Changed paths:	5
Log Message:	Merge r1574792 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/TestDFSShell.java	modified , text changed
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml	modified , text changed
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml	modified , text changed
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/testMRConf.xml	modified , text changed