big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDDS-992. ozone-default.xml has invalid text from a stale merge. Contributed by Dinesh Chitlangia.

Browse Source
This commit is contained in:
Bharat Viswanadham 2019-01-22 13:37:05 -08:00
parent 9390a0beef
commit 0ef54f72a6
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdds/common/src/main/resources/ozone-default.xml
View File

@ -1572,10 +1572,7 @@
<description>Key to enable/disable ozone acls.</description> <description>Key to enable/disable ozone acls.</description>
</property> </property>
<property> <property>
<name>ozone.scm.kerberos.keytab.file</name>
=======
<name>hdds.scm.kerberos.keytab.file</name> <name>hdds.scm.kerberos.keytab.file</name>
>>>>>>> HDDS-70. Fix config names for secure ksm and scm. Contributed by Ajay Kumar.
<value></value> <value></value>
<tag> OZONE, SECURITY</tag> <tag> OZONE, SECURITY</tag>
<description> The keytab file used by each SCM daemon to login as its <description> The keytab file used by each SCM daemon to login as its