8 years ago · f1de2c8560
--- a/hadoop-mapreduce-project/.gitignore
+++ b/hadoop-mapreduce-project/.gitignore
@@ -29,7 +29,6 @@ conf/core-site.xml
 
				 conf/hdfs-site.xml
			
 
				 conf/hadoop-env.sh
			
 
				 conf/hadoop-site.xml
			
 
				-conf/mapred-site.xml
			
 
				 conf/hadoop-policy.xml
			
 
				 conf/capacity-scheduler.xml
			
 
				 conf/fair-scheduler.xml
			
--- a/hadoop-mapreduce-project/conf/mapred-site.xml.template
+++ b/hadoop-mapreduce-project/conf/mapred-site.xml.template