Repository: hadoop Updated Branches: refs/heads/branch-2.8 1d322ca5c -> 1d15c9023
HADOOP-12755. Fix typo in defaultFS warning message. (cherry picked from commit 8171874dd198a6d10f48211f311595b222e6b930) (cherry picked from commit b4ad58796b70954804ad96f0c15381ad13e7a8ea) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1d15c902 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1d15c902 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1d15c902 Branch: refs/heads/branch-2.8 Commit: 1d15c9023340a0815ea3f3beebcdd378603a3e81 Parents: 1d322ca Author: Andrew Wang <[email protected]> Authored: Tue Feb 2 11:56:37 2016 -0800 Committer: Andrew Wang <[email protected]> Committed: Tue Feb 2 11:57:00 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/1d15c902/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 f3b026f..c606f1c 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -382,6 +382,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/1d15c902/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/1d15c902/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
