Author: rvs
Date: Fri May 18 14:50:32 2012
New Revision: 1340115
URL: http://svn.apache.org/viewvc?rev=1340115&view=rev
Log:
BIGTOP-592. clean up content of conf.empty and conf.pseudo config files
Removed:
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.empty/README
Modified:
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.empty/mapred-site.xml
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Modified:
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml?rev=1340115&r1=1340114&r2=1340115&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml
(original)
+++
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml
Fri May 18 14:50:32 2012
@@ -121,11 +121,6 @@
</property>
<property>
- <name>mapreduce.admin.user.env</name>
-
<value>CLASSPATH=/etc/hadoop/conf/*:/usr/lib/hadoop/*:/usr/lib/hadoop/lib/*:/usr/lib/hadoop/lib/native/*</value>
- </property>
-
- <property>
<name>mapreduce.jobtracker.address</name>
<value><%= hadoop_jobtracker_host %>:<%= hadoop_jobtracker_port%></value>
</property>
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.empty/mapred-site.xml
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.empty/mapred-site.xml?rev=1340115&r1=1340114&r2=1340115&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.empty/mapred-site.xml
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.empty/mapred-site.xml
Fri May 18 14:50:32 2012
@@ -18,14 +18,4 @@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<configuration>
- <property>
- <name>mapred.job.tracker</name>
- <value>localhost:8021</value>
- </property>
-
- <property>
- <name>mapreduce.admin.user.env</name>
-
<value>CLASSPATH=/etc/hadoop/conf/*:/usr/lib/hadoop/*:/usr/lib/hadoop/lib/*:/usr/lib/hadoop/lib/native/*</value>
- </property>
-
</configuration>
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml?rev=1340115&r1=1340114&r2=1340115&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
Fri May 18 14:50:32 2012
@@ -29,11 +29,6 @@
</property>
<property>
- <name>mapreduce.admin.user.env</name>
-
<value>CLASSPATH=/etc/hadoop/conf/*:/usr/lib/hadoop/*:/usr/lib/hadoop/lib/*:/usr/lib/hadoop/lib/native/*</value>
- </property>
-
- <property>
<description>To set the value of tmp directory for map and reduce
tasks.</description>
<name>mapreduce.task.tmp.dir</name>
<value>/var/lib/hadoop-mapreduce/cache/${user.name}/tasks</value>
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install?rev=1340115&r1=1340114&r2=1340115&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
Fri May 18 14:50:32 2012
@@ -1,4 +1,5 @@
/etc/security/limits.d/mapreduce.conf
+/etc/hadoop/conf.empty/mapred-site.xml
/usr/lib/hadoop-mapreduce
/usr/lib/hadoop/libexec/mapred-config.sh
/usr/bin/mapred
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1340115&r1=1340114&r2=1340115&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Fri
May 18 14:50:32 2012
@@ -577,6 +577,7 @@ fi
%files mapreduce
%defattr(-,root,root)
+%config(noreplace) %{etc_hadoop}/conf.empty/mapred-site.xml
%config(noreplace) /etc/security/limits.d/mapreduce.conf
%{lib_mapreduce}
%{lib_hadoop}/libexec/mapred-config.sh
