Gera Shegalov created HDFS-13349: ------------------------------------ Summary: Unresolved merge conflict in ViewFs.md Key: HDFS-13349 URL: https://issues.apache.org/jira/browse/HDFS-13349 Project: Hadoop HDFS Issue Type: Bug Components: documentation Affects Versions: 3.0.1 Reporter: Gera Shegalov
A backport to 3.0.1 has an unresolved conflict in ViewFs.md changeĀ ``` commit 9264f10bb35dbe30c75c648bf759e8aeb715834a Author: Anu Engineer <aengin...@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 ``` -- This message was sent by Atlassian JIRA (v7.6.3#76005) --------------------------------------------------------------------- To unsubscribe, e-mail: hdfs-issues-unsubscr...@hadoop.apache.org For additional commands, e-mail: hdfs-issues-h...@hadoop.apache.org