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/4bc00b21 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4bc00b21 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4bc00b21 Branch: refs/heads/HDDS-4 Commit: 4bc00b2131e81f980d09c02bd798ce171b1a200d Parents: e4c9cb6 Author: Xiaoyu Yao <[email protected]> Authored: Tue May 15 16:56:24 2018 -0700 Committer: Xiaoyu Yao <[email protected]> Committed: Wed Nov 21 12:11:14 2018 -0800 ---------------------------------------------------------------------- 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/4bc00b21/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 86742ce..f99f13b 100644 --- a/hadoop-hdds/common/src/main/resources/ozone-default.xml +++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml @@ -190,7 +190,6 @@ </description> </property> <property> -<<<<<<< HEAD <name>dfs.ratis.client.request.timeout.duration</name> <value>3s</value> <tag>OZONE, RATIS, MANAGEMENT</tag> @@ -248,9 +247,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: [email protected] For additional commands, e-mail: [email protected]
