You are viewing a plain text version of this content. The canonical link for it is here.

Posted to mapreduce-commits@hadoop.apache.org by bo...@apache.org on 2012/02/25 00:01:32 UTC

svn commit: r1293470 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt bin/mapred

Author: bobby
Date: Fri Feb 24 23:01:32 2012
New Revision: 1293470

URL: http://svn.apache.org/viewvc?rev=1293470&view=rev
Log:
svn merge -c 1293469 trunk ot branch-0.23 FIXES MAPREDUCE-3918 proc_historyserver no longer in command line arguments for HistoryServer (Jon Eagles via bobby)

Modified:
    hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
    hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/bin/mapred

Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1293470&r1=1293469&r2=1293470&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Fri Feb 24 23:01:32 2012
@@ -26,6 +26,8 @@ Release 0.23.2 - UNRELEASED
   OPTIMIZATIONS
 
   BUG FIXES
+    MAPREDUCE-3918  proc_historyserver no longer in command line arguments for
+    HistoryServer (Jon Eagles via bobby)
 
     MAPREDUCE-3862.  Nodemanager can appear to hang on shutdown due to lingering
     DeletionService threads (Jason Lowe via bobby)

Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/bin/mapred
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/bin/mapred?rev=1293470&r1=1293469&r2=1293470&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/bin/mapred (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/bin/mapred Fri Feb 24 23:01:32 2012
@@ -136,4 +136,4 @@ fi
 HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.security.logger=${HADOOP_SECURITY_LOGGER:-INFO,NullAppender}"
 
 export CLASSPATH
-exec "$JAVA" $JAVA_HEAP_MAX $HADOOP_OPTS $CLASS "$@"
+exec "$JAVA" -Dproc_$COMMAND $JAVA_HEAP_MAX $HADOOP_OPTS $CLASS "$@"