Projects >> hadoop-common >>10920c6c8169ddc0a09153944b257064c0921f89

Chunk
Conflicting content 
      DFSUtil.setGenericConf(conf, nameserviceId, namenodeId,
          NAMESERVICE_SPECIFIC_KEYS);
    }
<<<<<<< HEAD
    
    DFSUtil.setGenericConf(conf, nameserviceId, namenodeId,
        NAMENODE_SPECIFIC_KEYS);
    DFSUtil.setGenericConf(conf, nameserviceId, null,
        NAMESERVICE_SPECIFIC_KEYS);
    
=======
>>>>>>> 6cf0c946568ac42d3365f1d50e528febfc2c250e
    if (conf.get(DFS_NAMENODE_RPC_ADDRESS_KEY) != null) {
      URI defaultUri = URI.create(HdfsConstants.HDFS_URI_SCHEME + "://"
          + conf.get(DFS_NAMENODE_RPC_ADDRESS_KEY));
Solution content 
      DFSUtil.setGenericConf(conf, nameserviceId, namenodeId,
          NAMENODE_SPECIFIC_KEYS);
      DFSUtil.setGenericConf(conf, nameserviceId, null,
          NAMESERVICE_SPECIFIC_KEYS);
    }
    
    if (conf.get(DFS_NAMENODE_RPC_ADDRESS_KEY) != null) {
      URI defaultUri = URI.create(HdfsConstants.HDFS_URI_SCHEME + "://"
          + conf.get(DFS_NAMENODE_RPC_ADDRESS_KEY));
File
NameNode.java
Developer's decision
Manual
Kind of conflict
Method invocation