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

HADOOP-8282. svn merge -c 1326890 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326891 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-04-17 02:44:52 +00:00
parent 38511d889a
commit 13b40b4843
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,6 +240,9 @@ Release 2.0.0 - UNRELEASED
properly if no local node and first node is local rack node. properly if no local node and first node is local rack node.
(Junping Du) (Junping Du)
HADOOP-8282. start-all.sh refers incorrectly start-dfs.sh
existence for starting start-yarn.sh. (Devaraj K via eli)
BREAKDOWN OF HADOOP-7454 SUBTASKS BREAKDOWN OF HADOOP-7454 SUBTASKS
HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh) HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)

2
hadoop-common-project/hadoop-common/src/main/bin/start-all.sh
View File

@ -33,6 +33,6 @@ if [ -f "${HADOOP_HDFS_HOME}"/sbin/start-dfs.sh ]; then
fi fi
# start yarn daemons if yarn is present # start yarn daemons if yarn is present
if [ -f "${YARN_HOME}"/sbin/start-dfs.sh ]; then if [ -f "${YARN_HOME}"/sbin/start-yarn.sh ]; then
"${YARN_HOME}"/sbin/start-yarn.sh --config $HADOOP_CONF_DIR "${YARN_HOME}"/sbin/start-yarn.sh --config $HADOOP_CONF_DIR
fi fi