Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Bad merge with 996a627b289947af3894bf83e7b63ec702a665cd" 

This reverts commit 996a627b289947af3894bf83e7b63ec702a665cd.
This commit is contained in:
Xiaoyu Yao 2018-05-15 16:56:24 -07:00
parent 8e6743eb90
commit bfa4929fdb
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdds/common/src/main/resources/ozone-default.xml
View File

@ -228,7 +228,6 @@
</description> </description>
</property> </property>
<property> <property>
<<<<<<< HEAD
<name>dfs.ratis.client.request.timeout.duration</name> <name>dfs.ratis.client.request.timeout.duration</name>
<value>3s</value> <value>3s</value>
<tag>OZONE, RATIS, MANAGEMENT</tag> <tag>OZONE, RATIS, MANAGEMENT</tag>
@ -286,9 +285,6 @@
</property> </property>
<property> <property>
<name>hdds.container.report.interval</name> <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> <value>60000ms</value>
<tag>OZONE, CONTAINER, MANAGEMENT</tag> <tag>OZONE, CONTAINER, MANAGEMENT</tag>
<description>Time interval of the datanode to send container report. Each <description>Time interval of the datanode to send container report. Each