Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1298066 from trunk for HDFS-2038. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298069 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2012-03-07 19:45:50 +00:00
parent 1061a1ea76
commit c584783fd9
3 changed files with 1072 additions and 1139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -244,6 +244,9 @@ Release 0.23.2 - UNRELEASED
HDFS-3032. Change DFSClient.renewLease() so that it only retries up to the HDFS-3032. Change DFSClient.renewLease() so that it only retries up to the
lease soft-limit. (Kihwal Lee via szetszwo) lease soft-limit. (Kihwal Lee via szetszwo)
HDFS-2038. Update TestHDFSCLI to handle relative paths with globs.
(Kihwal Lee via szetszwo)
Release 0.23.1 - 2012-02-17 Release 0.23.1 - 2012-02-17
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

3
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestHDFSCLI.java
View File

@ -29,6 +29,7 @@ import org.apache.hadoop.security.authorize.PolicyProvider;
import org.junit.After; import org.junit.After;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import org.junit.Before; import org.junit.Before;
import org.junit.Test;
public class TestHDFSCLI extends CLITestHelperDFS { public class TestHDFSCLI extends CLITestHelperDFS {
@ -95,7 +96,7 @@ public class TestHDFSCLI extends CLITestHelperDFS {
//TODO: The test is failing due to the change in HADOOP-7360. //TODO: The test is failing due to the change in HADOOP-7360.
// HDFS-2038 is going to fix it. Disable the test for the moment. // HDFS-2038 is going to fix it. Disable the test for the moment.
//@Test @Test
@Override @Override
public void testAll () { public void testAll () {
super.testAll(); super.testAll();

2205
hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
View File

File diff suppressed because it is too large Load Diff