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/ae4dbb6a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ae4dbb6a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ae4dbb6a Branch: refs/heads/HDDS-4 Commit: ae4dbb6a1f5711bed5860bdfc0ef61c3c3be35f1 Parents: b27d6e2 Author: Xiaoyu Yao <x...@apache.org> Authored: Tue May 15 16:56:24 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 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ae4dbb6a/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 8ab40f1..e4a2aa4f 100644 --- a/hadoop-hdds/common/src/main/resources/ozone-default.xml +++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml @@ -206,7 +206,6 @@ </description> </property> <property> -<<<<<<< HEAD <name>dfs.ratis.client.request.timeout.duration</name> <value>3s</value> <tag>OZONE, RATIS, MANAGEMENT</tag> @@ -264,9 +263,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
