HDDS-6. Enable SCM kerberos auth. Contributed by Ajay Kumar.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/af0c8f6d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/af0c8f6d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/af0c8f6d Branch: refs/heads/HDDS-4 Commit: af0c8f6d0999a6bbd96da8d95552222be2341d18 Parents: be2497e Author: Xiaoyu Yao <x...@apache.org> Authored: Wed May 9 15:56:03 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 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/af0c8f6d/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 287d913..3ed4f09 100644 --- a/hadoop-hdds/common/src/main/resources/ozone-default.xml +++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml @@ -160,6 +160,7 @@ </description> </property> <property> +<<<<<<< HEAD <name>dfs.ratis.client.request.timeout.duration</name> <value>3s</value> <tag>OZONE, RATIS, MANAGEMENT</tag> @@ -217,6 +218,9 @@ </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
