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 <x...@apache.org>
Authored: Wed May 9 15:56:03 2018 -0700
Committer: Xiaoyu Yao <x...@apache.org>
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 @@
     </description>
   </property>
   <property>
+<<<<<<< HEAD
     <name>dfs.ratis.client.request.timeout.duration</name>
     <value>3s</value>
     <tag>OZONE, RATIS, MANAGEMENT</tag>
@@ -263,6 +264,9 @@
   </property>
   <property>
     <name>hdds.container.report.interval</name>
+=======
+    <name>ozone.container.report.interval</name>
+>>>>>>> HDDS-6. Enable SCM kerberos auth. Contributed by Ajay Kumar.
     <value>60000ms</value>
     <tag>OZONE, CONTAINER, MANAGEMENT</tag>
     <description>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

Reply via email to