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 wa...@apache.org on 2016/02/02 20:57:06 UTC

hadoop git commit: HADOOP-12755. Fix typo in defaultFS warning message.

Repository: hadoop
Updated Branches:
  refs/heads/trunk 43e669b22 -> 8171874dd


HADOOP-12755. Fix typo in defaultFS warning message.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8171874d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8171874d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8171874d

Branch: refs/heads/trunk
Commit: 8171874dd198a6d10f48211f311595b222e6b930
Parents: 43e669b
Author: Andrew Wang <wa...@apache.org>
Authored: Tue Feb 2 11:56:37 2016 -0800
Committer: Andrew Wang <wa...@apache.org>
Committed: Tue Feb 2 11:56:37 2016 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                    | 2 ++
 .../src/main/java/org/apache/hadoop/fs/shell/FsCommand.java        | 2 +-
 .../src/test/java/org/apache/hadoop/fs/shell/TestLs.java           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/8171874d/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 844bc36..c7549c6 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1091,6 +1091,8 @@ Release 2.8.0 - UNRELEASED
 
     HADOOP-12696. Add tests for S3Filesystem Contract (Matt Paduano via raviprak)
 
+    HADOOP-12755. Fix typo in defaultFS warning message. (wang)
+
   OPTIMIZATIONS
 
     HADOOP-11785. Reduce the number of listStatus operation in distcp

http://git-wip-us.apache.org/repos/asf/hadoop/blob/8171874d/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
index 971950f..f274f67 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
@@ -112,7 +112,7 @@ abstract public class FsCommand extends Command {
           defaultFs == null || defaultFs.equals(FS_DEFAULT_NAME_DEFAULT);
       if (missingDefaultFs) {
         err.printf(
-            "Warning: fs.defaultFs is not set when running \"%s\" command.%n",
+            "Warning: fs.defaultFS is not set when running \"%s\" command.%n",
             getCommandName());
       }
     }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/8171874d/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestLs.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestLs.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestLs.java
index cba44ee..0df1a6a 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestLs.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestLs.java
@@ -1062,7 +1062,7 @@ public class TestLs {
     ls.err = err;
     ls.run("file:///.");
     assertEquals(shouldDisplay, buf.toString().contains(
-        "Warning: fs.defaultFs is not set when running \"ls\" command."));
+        "Warning: fs.defaultFS is not set when running \"ls\" command."));
   }
 
   @Test