[02/37] hadoop git commit: MAPREDUCE-6875. Rename mapred-site.xml.template to mapred-site.xml. (Yuanbo Liu via Haibo Chen)

2017-04-21 Thread virajith
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/HDFS-9806
Commit: f1de2c8560a4ce1a346727c2c265570c5b6b872e
Parents: ac3cfdf
Author: Haibo Chen 
Authored: Mon Apr 17 12:00:15 2017 -0700
Committer: Haibo Chen 
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 000..761c352
--- /dev/null
+++ b/hadoop-mapreduce-project/conf/mapred-site.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+

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..000
--- a/hadoop-mapreduce-project/conf/mapred-site.xml.template
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



[22/50] hadoop git commit: MAPREDUCE-6875. Rename mapred-site.xml.template to mapred-site.xml. (Yuanbo Liu via Haibo Chen)

2017-04-20 Thread jhung
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 
Authored: Mon Apr 17 12:00:15 2017 -0700
Committer: Haibo Chen 
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 000..761c352
--- /dev/null
+++ b/hadoop-mapreduce-project/conf/mapred-site.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+

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..000
--- a/hadoop-mapreduce-project/conf/mapred-site.xml.template
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



hadoop git commit: MAPREDUCE-6875. Rename mapred-site.xml.template to mapred-site.xml. (Yuanbo Liu via Haibo Chen)

2017-04-17 Thread haibochen
Repository: hadoop
Updated Branches:
  refs/heads/trunk ac3cfdf3e -> f1de2c856


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/trunk
Commit: f1de2c8560a4ce1a346727c2c265570c5b6b872e
Parents: ac3cfdf
Author: Haibo Chen 
Authored: Mon Apr 17 12:00:15 2017 -0700
Committer: Haibo Chen 
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 000..761c352
--- /dev/null
+++ b/hadoop-mapreduce-project/conf/mapred-site.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+

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..000
--- a/hadoop-mapreduce-project/conf/mapred-site.xml.template
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org