MAPREDUCE-6875. Rename mapred-site.xml.template to mapred-site.xml. (Yuanbo Liu via Haibo Chen)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f1de2c85 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f1de2c85 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f1de2c85 Branch: refs/heads/YARN-5734 Commit: f1de2c8560a4ce1a346727c2c265570c5b6b872e Parents: ac3cfdf Author: Haibo Chen <haiboc...@cloudera.com> Authored: Mon Apr 17 12:00:15 2017 -0700 Committer: Haibo Chen <haiboc...@cloudera.com> Committed: Mon Apr 17 12:25:30 2017 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/.gitignore | 1 - hadoop-mapreduce-project/conf/mapred-site.xml | 21 ++++++++++++++++++++ .../conf/mapred-site.xml.template | 21 -------------------- 3 files changed, 21 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1de2c85/hadoop-mapreduce-project/.gitignore ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/.gitignore b/hadoop-mapreduce-project/.gitignore index d230896..0a86cfe 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1de2c85/hadoop-mapreduce-project/conf/mapred-site.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/conf/mapred-site.xml b/hadoop-mapreduce-project/conf/mapred-site.xml new file mode 100644 index 0000000..761c352 --- /dev/null +++ b/hadoop-mapreduce-project/conf/mapred-site.xml @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. See accompanying LICENSE file. +--> + +<!-- Put site-specific property overrides in this file. --> + +<configuration> + +</configuration> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1de2c85/hadoop-mapreduce-project/conf/mapred-site.xml.template ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/conf/mapred-site.xml.template b/hadoop-mapreduce-project/conf/mapred-site.xml.template deleted file mode 100644 index 761c352..0000000 --- a/hadoop-mapreduce-project/conf/mapred-site.xml.template +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> -<!-- - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. See accompanying LICENSE file. ---> - -<!-- Put site-specific property overrides in this file. --> - -<configuration> - -</configuration> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
