[16/50] [abbrv] hadoop git commit: HDDS-6. Enable SCM kerberos auth. Contributed by Ajay Kumar.

2018-12-04 Thread xyao
HDDS-6. Enable SCM kerberos auth. Contributed by Ajay Kumar.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b27d6e23
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b27d6e23
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b27d6e23

Branch: refs/heads/HDDS-4
Commit: b27d6e234c21d1713b446cc473c1e9f25d810106
Parents: 759b504
Author: Xiaoyu Yao 
Authored: Wed May 9 15:56:03 2018 -0700
Committer: Xiaoyu Yao 
Committed: Tue Dec 4 08:03:14 2018 -0800

--
 hadoop-hdds/common/src/main/resources/ozone-default.xml | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b27d6e23/hadoop-hdds/common/src/main/resources/ozone-default.xml
--
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml 
b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index e4a2aa4f..8ab40f1 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -206,6 +206,7 @@
 
   
   
+<<< HEAD
 dfs.ratis.client.request.timeout.duration
 3s
 OZONE, RATIS, MANAGEMENT
@@ -263,6 +264,9 @@
   
   
 hdds.container.report.interval
+===
+ozone.container.report.interval
+>>> HDDS-6. Enable SCM kerberos auth. Contributed by Ajay Kumar.
 6ms
 OZONE, CONTAINER, MANAGEMENT
 Time interval of the datanode to send container report. Each


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



[16/50] [abbrv] hadoop git commit: HDDS-6. Enable SCM kerberos auth. Contributed by Ajay Kumar.

2018-11-29 Thread xyao
HDDS-6. Enable SCM kerberos auth. Contributed by Ajay Kumar.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fcd705a5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fcd705a5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fcd705a5

Branch: refs/heads/HDDS-4
Commit: fcd705a59420dcb5d6a05e2d49536a77ae4f1d5b
Parents: 2119be4
Author: Xiaoyu Yao 
Authored: Wed May 9 15:56:03 2018 -0700
Committer: Xiaoyu Yao 
Committed: Thu Nov 29 11:56:49 2018 -0800

--
 hadoop-hdds/common/src/main/resources/ozone-default.xml | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd705a5/hadoop-hdds/common/src/main/resources/ozone-default.xml
--
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml 
b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index d3e352b..4d79e8c 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -198,6 +198,7 @@
 
   
   
+<<< HEAD
 dfs.ratis.client.request.timeout.duration
 3s
 OZONE, RATIS, MANAGEMENT
@@ -255,6 +256,9 @@
   
   
 hdds.container.report.interval
+===
+ozone.container.report.interval
+>>> HDDS-6. Enable SCM kerberos auth. Contributed by Ajay Kumar.
 6ms
 OZONE, CONTAINER, MANAGEMENT
 Time interval of the datanode to send container report. Each


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