You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2013/06/06 05:49:04 UTC
svn commit: r1490118 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
Author: suresh
Date: Thu Jun 6 03:49:04 2013
New Revision: 1490118
URL: http://svn.apache.org/r1490118
Log:
HADOOP-9131. Merge r1420366 from trunk.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1490118&r1=1490117&r2=1490118&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jun 6 03:49:04 2013
@@ -242,6 +242,10 @@ Release 2.1.0-beta - UNRELEASED
HADOOP-8957 AbstractFileSystem#IsValidName should be overridden for
embedded file systems like ViewFs (Chris Nauroth via Sanjay Radia)
+ HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos)
+
+ HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos)
+
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
@@ -416,9 +420,8 @@ Release 2.1.0-beta - UNRELEASED
HADOOP-9397. Incremental dist tar build fails. (Chris Nauroth via jlowe)
- HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos)
-
- HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos)
+ HADOOP-9131. Turn off TestLocalFileSystem#testListStatusWithColons on
+ Windows. (Chris Nauroth via suresh)
Release 2.0.5-alpha - UNRELEASED
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java?rev=1490118&r1=1490117&r2=1490118&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java Thu Jun 6 03:49:04 2013
@@ -20,6 +20,7 @@ package org.apache.hadoop.fs;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem.Statistics;
import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.util.Shell;
import static org.apache.hadoop.fs.FileSystemTestHelper.*;
@@ -28,6 +29,7 @@ import java.util.Arrays;
import java.util.Random;
import static org.junit.Assert.*;
+import static org.junit.Assume.assumeTrue;
import org.junit.After;
import org.junit.Before;
@@ -263,6 +265,7 @@ public class TestLocalFileSystem {
@Test(timeout = 1000)
public void testListStatusWithColons() throws IOException {
+ assumeTrue(!Shell.WINDOWS);
File colonFile = new File(TEST_ROOT_DIR, "foo:bar");
colonFile.mkdirs();
FileStatus[] stats = fileSys.listStatus(new Path(TEST_ROOT_DIR));