From 13b40b4843238415bb842176974cde2fcf8477e6 Mon Sep 17 00:00:00 2001 From: Eli Collins Date: Tue, 17 Apr 2012 02:44:52 +0000 Subject: [PATCH] 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 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-common-project/hadoop-common/src/main/bin/start-all.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index aec4502c0ea..27d3a074677 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -240,6 +240,9 @@ Release 2.0.0 - UNRELEASED properly if no local node and first node is local rack node. (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 HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh) diff --git a/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh b/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh index 9d579b29afa..f4047db4e22 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh +++ b/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh @@ -33,6 +33,6 @@ if [ -f "${HADOOP_HDFS_HOME}"/sbin/start-dfs.sh ]; then fi # 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 fi