Repository: bigtop Updated Branches: refs/heads/master 5cbbb7009 -> 1849e5809
BIGTOP-1118 Update mapreduce.shuffle to mapreduce_shuffle in yarn configurations for Hadoop 2.2.0 Signed-off-by: Mark Grover <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/1849e580 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/1849e580 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/1849e580 Branch: refs/heads/master Commit: 1849e5809e87cb7c2041ee82f3547d14eb098115 Parents: 5cbbb70 Author: wenwu <[email protected]> Authored: Tue Feb 25 21:04:17 2014 -0500 Committer: Mark Grover <[email protected]> Committed: Wed Mar 19 22:43:31 2014 -0700 ---------------------------------------------------------------------- bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml | 4 ++-- bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml | 4 ++-- bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/1849e580/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 69ff477..4433ba9 100644 --- a/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml +++ b/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml @@ -78,11 +78,11 @@ <property> <name>yarn.nodemanager.aux-services</name> - <value>mapreduce.shuffle</value> + <value>mapreduce_shuffle</value> </property> <property> - <name>yarn.nodemanager.aux-services.mapreduce.shuffle.class</name> + <name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name> <value>org.apache.hadoop.mapred.ShuffleHandler</value> </property> http://git-wip-us.apache.org/repos/asf/bigtop/blob/1849e580/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 810ac67..8dbf520 100755 --- a/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml +++ b/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml @@ -20,11 +20,11 @@ <configuration> <property> <name>yarn.nodemanager.aux-services</name> - <value>mapreduce.shuffle</value> + <value>mapreduce_shuffle</value> </property> <property> - <name>yarn.nodemanager.aux-services.mapreduce.shuffle.class</name> + <name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name> <value>org.apache.hadoop.mapred.ShuffleHandler</value> </property> http://git-wip-us.apache.org/repos/asf/bigtop/blob/1849e580/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 d50c63c..9e1a9f6 100644 --- a/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml +++ b/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml @@ -20,11 +20,11 @@ <configuration> <property> <name>yarn.nodemanager.aux-services</name> - <value>mapreduce.shuffle</value> + <value>mapreduce_shuffle</value> </property> <property> - <name>yarn.nodemanager.aux-services.mapreduce.shuffle.class</name> + <name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name> <value>org.apache.hadoop.mapred.ShuffleHandler</value> </property>
