[HDFS-13349] Unresolved merge conflict in ViewFs.md

• Type: Bug
• Status: Resolved
• Priority: Blocker
• Resolution: Fixed
• Affects Version/s: 3.0.1
• Fix Version/s: 3.0.3
• Component/s: documentation
• Target Version/s: 3.0.2
• Hadoop Flags: Reviewed
• Assignee: Yiqun Lin
• Reporter: Gera Shegalov
• Created: 26/Mar/18 17:00
• Updated: 04/Apr/18 22:23
• Resolved: 30/Mar/18 16:15

Description

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

commit 9264f10bb35dbe30c75c648bf759e8aeb715834a
 Author: Anu Engineer <[e-mail]>
 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