[jira] [Created] (HDDS-992) ozone-default.xml has invalid text from a stale merge

["Dinesh Chitlangia (JIRA)" <ji...@apache.org>]

Dinesh Chitlangia created HDDS-992:
--------------------------------------

             Summary: ozone-default.xml has invalid text from a stale merge
                 Key: HDDS-992
                 URL: https://issues.apache.org/jira/browse/HDDS-992
             Project: Hadoop Distributed Data Store
          Issue Type: Bug
            Reporter: Dinesh Chitlangia
            Assignee: Dinesh Chitlangia


This jira aims to remove the invalid text "=======" and ">>>>>>" from [https://github.com/apache/hadoop/blob/trunk/hadoop-hdds/common/src/main/resources/ozone-default.xml]
{code:java}
<property>
<name>ozone.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>
<tag> OZONE, SECURITY</tag>
<description> The keytab file used by each SCM daemon to login as its
service principal. The principal name is configured with
hdds.scm.kerberos.principal.
</description>
{code}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

---------------------------------------------------------------------
To unsubscribe, e-mail: hdfs-dev-unsubscribe@hadoop.apache.org
For additional commands, e-mail: hdfs-dev-help@hadoop.apache.org