big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge trunk into HA branch.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1231242 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Aaron Myers 2012-01-13 18:54:02 +00:00
commit 58f2da1c85
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/CHANGES.txt
View File

@ -73,6 +73,8 @@ Trunk (unreleased changes)
findBugs, correct links to findBugs artifacts and no links to the findBugs, correct links to findBugs artifacts and no links to the
artifacts when there are no warnings. (Tom White via vinodkv). artifacts when there are no warnings. (Tom White via vinodkv).
MAPREDUCE-3664. Federation Documentation has incorrect configuration example.
(Brandon Li via jitendra)
Release 0.23.1 - Unreleased Release 0.23.1 - Unreleased

4
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/Federation.apt.vm
View File

@ -169,7 +169,7 @@ HDFS Federation
</property> </property>
<property> <property>
<name>dfs.namenode.rpc-address.ns1</name> <name>dfs.namenode.rpc-address.ns1</name>
<value>hdfs://nn-host1:rpc-port</value> <value>nn-host1:rpc-port</value>
</property> </property>
<property> <property>
<name>dfs.namenode.http-address.ns1</name> <name>dfs.namenode.http-address.ns1</name>
@ -181,7 +181,7 @@ HDFS Federation
</property> </property>
<property> <property>
<name>dfs.namenode.rpc-address.ns2</name> <name>dfs.namenode.rpc-address.ns2</name>
<value>hdfs://nn-host2:rpc-port</value> <value>nn-host2:rpc-port</value>
</property> </property>
<property> <property>
<name>dfs.namenode.http-address.ns2</name> <name>dfs.namenode.http-address.ns2</name>