[ https://issues.apache.org/jira/browse/HDFS-13349?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Akira Ajisaka updated HDFS-13349: --------------------------------- Resolution: Fixed Hadoop Flags: Reviewed Fix Version/s: 3.0.2 Status: Resolved (was: Patch Available) Committed to branch-3.0. Thanks [~linyiqun] for the contribution and thanks [~jira.shegalov] for the report. > 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 > Assignee: Yiqun Lin > Priority: Blocker > Fix For: 3.0.2 > > Attachments: HDFS-13349-branch-3.0.001.patch > > > A backport to 3.0.1 has an unresolved conflict in ViewFs.md changeĀ > {code} > 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 > {code} -- 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