From bfa4929fdb3689085af022c7e09628a00a828846 Mon Sep 17 00:00:00 2001
From: Xiaoyu Yao <xyao@apache.org>
Date: Tue, 15 May 2018 16:56:24 -0700
Subject: [PATCH] Revert "Bad merge with
 996a627b289947af3894bf83e7b63ec702a665cd"

This reverts commit 996a627b289947af3894bf83e7b63ec702a665cd.
---
 hadoop-hdds/common/src/main/resources/ozone-default.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index 8bfce9acfa0..c113c2608b3 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -228,7 +228,6 @@
     </description>
   </property>
   <property>
-<<<<<<< HEAD
     <name>dfs.ratis.client.request.timeout.duration</name>
     <value>3s</value>
     <tag>OZONE, RATIS, MANAGEMENT</tag>
@@ -286,9 +285,6 @@
   </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