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 tg...@apache.org on 2012/04/25 20:00:11 UTC
svn commit: r1330446 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/log/LogLevel.java
Author: tgraves
Date: Wed Apr 25 18:00:11 2012
New Revision: 1330446
URL: http://svn.apache.org/viewvc?rev=1330446&view=rev
Log:
merge -r 1330444:1330445 from trunk. FIXES: HADOOP-8296
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.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=1330446&r1=1330445&r2=1330446&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 Wed Apr 25 18:00:11 2012
@@ -258,6 +258,8 @@ Release 2.0.0 - UNRELEASED
HADOOP-8314. HttpServer#hasAdminAccess should return false if
authorization is enabled but user is not authenticated. (tucu)
+ HADOOP-8296. hadoop/yarn daemonlog usage wrong (Devaraj K via tgraves)
+
BREAKDOWN OF HADOOP-7454 SUBTASKS
HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java?rev=1330446&r1=1330445&r2=1330446&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java Wed Apr 25 18:00:11 2012
@@ -36,11 +36,9 @@ import org.apache.hadoop.util.ServletUti
*/
@InterfaceStability.Evolving
public class LogLevel {
- public static final String USAGES = "\nUSAGES:\n"
- + "java " + LogLevel.class.getName()
- + " -getlevel <host:port> <name>\n"
- + "java " + LogLevel.class.getName()
- + " -setlevel <host:port> <name> <level>\n";
+ public static final String USAGES = "\nUsage: General options are:\n"
+ + "\t[-getlevel <host:httpPort> <name>]\n"
+ + "\t[-setlevel <host:httpPort> <name> <level>]\n";
/**
* A command line implementation