From c33ecd83e42c1f688875979761c6077c92c415b2 Mon Sep 17 00:00:00 2001 From: Harsh J Date: Thu, 26 Mar 2015 11:27:21 +0530 Subject: [PATCH] HADOOP-11719.[Fsshell] Remove bin/hadoop reference from GenericOptionsParser default help text. Contributed by Brahma Reddy Battula. (cherry picked from commit 1ede5e6e1e7f51cf13d0488bb1b0e126c865656c) --- hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++++ .../java/org/apache/hadoop/util/GenericOptionsParser.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 04817af8827..e2dbe8dc67f 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -14,6 +14,10 @@ Release 2.8.0 - UNRELEASED IMPROVEMENTS + HADOOP-11719. [Fsshell] Remove bin/hadoop reference from + GenericOptionsParser default help text. + (Brahma Reddy Battula via harsh) + HADOOP-11692. Improve authentication failure WARN message to avoid user confusion. (Yongjun Zhang) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java index 0a46a7a81ca..925aad680aa 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java @@ -513,7 +513,7 @@ public class GenericOptionsParser { "specify comma separated archives to be unarchived" + " on the compute machines.\n"); out.println("The general command line syntax is"); - out.println("bin/hadoop command [genericOptions] [commandOptions]\n"); + out.println("command [genericOptions] [commandOptions]\n"); } }