Uploaded image for project: 'Hadoop HDFS'
  1. Hadoop HDFS
  2. HDFS-13349

Unresolved merge conflict in ViewFs.md

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Resolved
    • Blocker
    • Resolution: Fixed
    • 3.0.1
    • 3.0.3
    • documentation
    • None
    • Reviewed

    Description

      A backport to 3.0.1 has an unresolved conflict in ViewFs.md changeĀ 

      commit 9264f10bb35dbe30c75c648bf759e8aeb715834a
       Author: Anu Engineer <aengineer@apache.org>
       Date: Tue Feb 6 13:43:45 2018 -0800
      
      HDFS-12990. Change default NameNode RPC port back to 8020. Contributed by Xiao Chen.
      
      (cherry picked from commit 4304fcd5bdf9fb7aa9181e866eea383f89bf171f)
      
      Conflicts:
       hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/ViewFs.md
       hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java
      

      Attachments

        Activity

          People

            linyiqun Yiqun Lin
            jira.shegalov Gera Shegalov
            Votes:
            0 Vote for this issue
            Watchers:
            5 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: