Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -r 1203487:1203488 from trunk to branch-0.23. Fixes: MAPREDUCE-3372 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203489 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2011-11-18 05:15:17 +00:00
parent 9a4a187060
commit 1f0fc2da93
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -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

2
hadoop-mapreduce-project/src/examples/python/compile
View File

@ -12,7 +12,7 @@
# limitations under the License.
export HADOOP_PREFIX=../../..
export HADOOP_PREFIX=${HADOOP_PREFIX:-../../..}
export CLASSPATH="$HADOOP_PREFIX/build/classes"

2
hadoop-mapreduce-project/src/examples/python/pyAbacus/compile
View File

@ -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"

2
hadoop-mapreduce-project/src/packages/deb/init.d/hadoop-historyserver
View File

@ -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)

2
hadoop-mapreduce-project/src/packages/rpm/init.d/hadoop-historyserver
View File

@ -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): "