BIGTOP-755. YARN_HOME is now HADOOP_YARN_HOME git-svn-id: https://svn.apache.org/repos/asf/bigtop/trunk@1399884 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/a893c8ec Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/a893c8ec Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/a893c8ec Branch: refs/heads/master Commit: a893c8ec296d262a8dbdf444063fd9d528a0177a Parents: cf26255 Author: rvs <rvs@13f79535-47bb-0310-9956-ffa450edef68> Authored: Thu Oct 18 22:03:31 2012 +0000 Committer: Roman Shaposhnik <[email protected]> Committed: Fri Nov 2 08:39:24 2012 -0700 ---------------------------------------------------------------------- .../puppet/modules/hadoop/templates/yarn-site.xml | 2 +- .../src/common/hadoop/conf.empty/yarn-site.xml | 2 +- .../src/common/hadoop/conf.pseudo/yarn-site.xml | 2 +- bigtop-packages/src/common/hadoop/hadoop-layout.sh | 2 +- bigtop-packages/src/common/hadoop/hadoop.default | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/a893c8ec/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml b/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml index 99551d2..07ead0c 100644 --- a/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml +++ b/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml @@ -130,7 +130,7 @@ $HADOOP_COMMON_HOME/*,$HADOOP_COMMON_HOME/lib/*, $HADOOP_HDFS_HOME/*,$HADOOP_HDFS_HOME/lib/*, $HADOOP_MAPRED_HOME/*,$HADOOP_MAPRED_HOME/lib/*, - $YARN_HOME/*,$YARN_HOME/lib/* + $HADOOP_YARN_HOME/*,$HADOOP_YARN_HOME/lib/* </value> </property> </configuration> http://git-wip-us.apache.org/repos/asf/bigtop/blob/a893c8ec/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml b/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml index 306391d..810ac67 100755 --- a/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml +++ b/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml @@ -59,7 +59,7 @@ $HADOOP_COMMON_HOME/*,$HADOOP_COMMON_HOME/lib/*, $HADOOP_HDFS_HOME/*,$HADOOP_HDFS_HOME/lib/*, $HADOOP_MAPRED_HOME/*,$HADOOP_MAPRED_HOME/lib/*, - $YARN_HOME/*,$YARN_HOME/lib/* + $HADOOP_YARN_HOME/*,$HADOOP_YARN_HOME/lib/* </value> </property> </configuration> http://git-wip-us.apache.org/repos/asf/bigtop/blob/a893c8ec/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml b/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml index 306391d..810ac67 100644 --- a/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml +++ b/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml @@ -59,7 +59,7 @@ $HADOOP_COMMON_HOME/*,$HADOOP_COMMON_HOME/lib/*, $HADOOP_HDFS_HOME/*,$HADOOP_HDFS_HOME/lib/*, $HADOOP_MAPRED_HOME/*,$HADOOP_MAPRED_HOME/lib/*, - $YARN_HOME/*,$YARN_HOME/lib/* + $HADOOP_YARN_HOME/*,$HADOOP_YARN_HOME/lib/* </value> </property> </configuration> http://git-wip-us.apache.org/repos/asf/bigtop/blob/a893c8ec/bigtop-packages/src/common/hadoop/hadoop-layout.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/hadoop-layout.sh b/bigtop-packages/src/common/hadoop/hadoop-layout.sh index 8d9450f..2720d68 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-layout.sh +++ b/bigtop-packages/src/common/hadoop/hadoop-layout.sh @@ -27,4 +27,4 @@ HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-"/etc/hadoop/conf"} HADOOP_COMMON_HOME=${HADOOP_COMMON_HOME:-"/usr/lib/hadoop"} HADOOP_HDFS_HOME=${HADOOP_HDFS_HOME:-"/usr/lib/hadoop-hdfs"} HADOOP_MAPRED_HOME=${HADOOP_MAPRED_HOME:-"/usr/lib/hadoop-mapreduce"} -YARN_HOME=${YARN_HOME:-"/usr/lib/hadoop-yarn"} +HADOOP_YARN_HOME=${HADOOP_YARN_HOME:-"/usr/lib/hadoop-yarn"} http://git-wip-us.apache.org/repos/asf/bigtop/blob/a893c8ec/bigtop-packages/src/common/hadoop/hadoop.default ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/hadoop.default b/bigtop-packages/src/common/hadoop/hadoop.default index 184a86c..db1c758 100644 --- a/bigtop-packages/src/common/hadoop/hadoop.default +++ b/bigtop-packages/src/common/hadoop/hadoop.default @@ -22,4 +22,4 @@ export HADOOP_CONF_DIR=/etc/hadoop/conf export HADOOP_COMMON_HOME=/usr/lib/hadoop export HADOOP_HDFS_HOME=/usr/lib/hadoop-hdfs export HADOOP_MAPRED_HOME=/usr/lib/hadoop-mapreduce -export YARN_HOME=/usr/lib/hadoop-yarn +export HADOOP_YARN_HOME=/usr/lib/hadoop-yarn
