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

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -244,6 +244,9 @@ Release 0.23.2 - UNRELEASED
     HDFS-3032. Change DFSClient.renewLease() so that it only retries up to the
     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 
 
   INCOMPATIBLE CHANGES

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

@@ -29,6 +29,7 @@
 import org.junit.After;
 import static org.junit.Assert.assertTrue;
 import org.junit.Before;
+import org.junit.Test;
 
 public class TestHDFSCLI extends CLITestHelperDFS {
 
@@ -95,7 +96,7 @@ protected Result execute(CLICommand cmd) throws Exception {
 
   //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.
-  //@Test
+  @Test
   @Override
   public void testAll () {
     super.testAll();