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 to...@apache.org on 2011/11/18 06:15:17 UTC
svn commit: r1203489 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt
src/examples/python/compile src/examples/python/pyAbacus/compile
src/packages/deb/init.d/hadoop-historyserver
src/packages/rpm/init.d/hadoop-historyserver
Author: tomwhite
Date: Fri Nov 18 05:15:17 2011
New Revision: 1203489
URL: http://svn.apache.org/viewvc?rev=1203489&view=rev
Log:
Merge -r 1203487:1203488 from trunk to branch-0.23. Fixes: MAPREDUCE-3372
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/python/compile
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/python/pyAbacus/compile
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/packages/deb/init.d/hadoop-historyserver
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/packages/rpm/init.d/hadoop-historyserver
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=1203489&r1=1203488&r2=1203489&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 Nov 18 05:15:17 2011
@@ -47,6 +47,9 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3373. Hadoop scripts unconditionally source
"$bin"/../libexec/hadoop-config.sh. (Bruno Mahé via tomwhite)
+ MAPREDUCE-3372. HADOOP_PREFIX cannot be overridden.
+ (Bruno Mahé via tomwhite)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/python/compile
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/python/compile?rev=1203489&r1=1203488&r2=1203489&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/python/compile (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/python/compile Fri Nov 18 05:15:17 2011
@@ -12,7 +12,7 @@
# limitations under the License.
-export HADOOP_PREFIX=../../..
+export HADOOP_PREFIX=${HADOOP_PREFIX:-../../..}
export CLASSPATH="$HADOOP_PREFIX/build/classes"
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/python/pyAbacus/compile
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/python/pyAbacus/compile?rev=1203489&r1=1203488&r2=1203489&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/python/pyAbacus/compile (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples/python/pyAbacus/compile Fri Nov 18 05:15:17 2011
@@ -12,7 +12,7 @@
# limitations under the License.
-export HADOOP_PREFIX=../../../../..
+export HADOOP_PREFIX=${HADOOP_PREFIX:-../../../../..}
export CLASSPATH="$HADOOP_PREFIX/build/classes"
export CLASSPATH=${CLASSPATH}:"$HADOOP_PREFIX/build/contrib/abacus/classes"
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/packages/deb/init.d/hadoop-historyserver
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/packages/deb/init.d/hadoop-historyserver?rev=1203489&r1=1203488&r2=1203489&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/packages/deb/init.d/hadoop-historyserver (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/packages/deb/init.d/hadoop-historyserver Fri Nov 18 05:15:17 2011
@@ -67,7 +67,7 @@ check_privsep_dir() {
}
export PATH="${PATH:+$PATH:}/usr/sbin:/usr/bin"
-export HADOOP_PREFIX="/usr"
+export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
case "$1" in
start)
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/packages/rpm/init.d/hadoop-historyserver
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/packages/rpm/init.d/hadoop-historyserver?rev=1203489&r1=1203488&r2=1203489&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/packages/rpm/init.d/hadoop-historyserver (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/packages/rpm/init.d/hadoop-historyserver Fri Nov 18 05:15:17 2011
@@ -27,7 +27,7 @@ source /etc/default/hadoop-env.sh
RETVAL=0
PIDFILE="${HADOOP_PID_DIR}/hadoop-mapred-historyserver.pid"
desc="Hadoop historyserver daemon"
-export HADOOP_PREFIX="/usr"
+export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
start() {
echo -n $"Starting $desc (hadoop-historyserver): "