Revert "Bad merge with 996a627b289947af3894bf83e7b63ec702a665cd" This reverts commit 996a627b289947af3894bf83e7b63ec702a665cd.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eee307b7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eee307b7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eee307b7 Branch: refs/heads/HDDS-4 Commit: eee307b7e334daa2ef7007adde76572810286b01 Parents: af0c8f6 Author: Xiaoyu Yao <x...@apache.org> Authored: Tue May 15 16:56:24 2018 -0700 Committer: Xiaoyu Yao <x...@apache.org> Committed: Wed Oct 17 13:48:55 2018 -0700 ---------------------------------------------------------------------- hadoop-hdds/common/src/main/resources/ozone-default.xml | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/eee307b7/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 3ed4f09..287d913 100644 --- a/hadoop-hdds/common/src/main/resources/ozone-default.xml +++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml @@ -160,7 +160,6 @@ </description> </property> <property> -<<<<<<< HEAD <name>dfs.ratis.client.request.timeout.duration</name> <value>3s</value> <tag>OZONE, RATIS, MANAGEMENT</tag> @@ -218,9 +217,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 --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
