From f1de2c8560a4ce1a346727c2c265570c5b6b872e Mon Sep 17 00:00:00 2001 From: Haibo Chen Date: Mon, 17 Apr 2017 12:00:15 -0700 Subject: [PATCH] MAPREDUCE-6875. Rename mapred-site.xml.template to mapred-site.xml. (Yuanbo Liu via Haibo Chen) --- hadoop-mapreduce-project/.gitignore | 1 - .../conf/{mapred-site.xml.template => mapred-site.xml} | 0 2 files changed, 1 deletion(-) rename hadoop-mapreduce-project/conf/{mapred-site.xml.template => mapred-site.xml} (100%) diff --git a/hadoop-mapreduce-project/.gitignore b/hadoop-mapreduce-project/.gitignore index d230896bd77..0a86cfed18b 100644 --- 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 diff --git a/hadoop-mapreduce-project/conf/mapred-site.xml.template b/hadoop-mapreduce-project/conf/mapred-site.xml similarity index 100% rename from hadoop-mapreduce-project/conf/mapred-site.xml.template rename to hadoop-mapreduce-project/conf/mapred-site.xml