You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2011/05/06 06:30:43 UTC
svn commit: r1100049 - in /hadoop/common/branches/branch-0.22: ./ src/docs/
src/docs/src/documentation/content/xdocs/ src/java/ src/test/core/
src/test/core/org/apache/hadoop/io/
Author: eli
Date: Fri May 6 04:30:42 2011
New Revision: 1100049
URL: http://svn.apache.org/viewvc?rev=1100049&view=rev
Log:
HADOOP-7244. svn merge -c 1100048 from trunk
Modified:
hadoop/common/branches/branch-0.22/ (props changed)
hadoop/common/branches/branch-0.22/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.22/src/docs/ (props changed)
hadoop/common/branches/branch-0.22/src/docs/src/documentation/content/xdocs/cluster_setup.xml
hadoop/common/branches/branch-0.22/src/docs/src/documentation/content/xdocs/single_node_setup.xml
hadoop/common/branches/branch-0.22/src/java/ (props changed)
hadoop/common/branches/branch-0.22/src/test/core/ (props changed)
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java (props changed)
Propchange: hadoop/common/branches/branch-0.22/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 6 04:30:42 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044
+/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048
/hadoop/core/branches/branch-0.19/core:713112
Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1100049&r1=1100048&r2=1100049&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Fri May 6 04:30:42 2011
@@ -229,6 +229,9 @@ Release 0.22.0 - Unreleased
HADOOP-7241. fix typo of command 'hadoop fs -help tail'.
(Wei Yongjun via eli)
+ HADOOP-7244. Documentation change for updated configuration keys.
+ (tomwhite via eli)
+
OPTIMIZATIONS
HADOOP-6884. Add LOG.isDebugEnabled() guard for each LOG.debug(..).
Propchange: hadoop/common/branches/branch-0.22/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 6 04:30:42 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044
+/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Propchange: hadoop/common/branches/branch-0.22/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 6 04:30:42 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044
+/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048
/hadoop/core/branches/branch-0.19/src/docs:713112
Modified: hadoop/common/branches/branch-0.22/src/docs/src/documentation/content/xdocs/cluster_setup.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/docs/src/documentation/content/xdocs/cluster_setup.xml?rev=1100049&r1=1100048&r2=1100049&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/docs/src/documentation/content/xdocs/cluster_setup.xml (original)
+++ hadoop/common/branches/branch-0.22/src/docs/src/documentation/content/xdocs/cluster_setup.xml Fri May 6 04:30:42 2011
@@ -175,7 +175,7 @@
<th>Notes</th>
</tr>
<tr>
- <td>fs.default.name</td>
+ <td>fs.defaultFS</td>
<td>URI of <code>NameNode</code>.</td>
<td><em>hdfs://hostname/</em></td>
</tr>
@@ -190,7 +190,7 @@
<th>Notes</th>
</tr>
<tr>
- <td>dfs.name.dir</td>
+ <td>dfs.namenode.name.dir</td>
<td>
Path on the local filesystem where the <code>NameNode</code>
stores the namespace and transactions logs persistently.</td>
@@ -200,7 +200,7 @@
</td>
</tr>
<tr>
- <td>dfs.data.dir</td>
+ <td>dfs.datanode.data.dir</td>
<td>
Comma separated list of paths on the local filesystem of a
<code>DataNode</code> where it should store its blocks.
@@ -1298,9 +1298,9 @@
">resolve</a> in an administrator configured
module. The API resolves the slave's DNS name (also IP address) to a
rack id. What module to use can be configured using the configuration
- item <code>topology.node.switch.mapping.impl</code>. The default
+ item <code>net.topology.node.switch.mapping.impl</code>. The default
implementation of the same runs a script/command configured using
- <code>topology.script.file.name</code>. If topology.script.file.name is
+ <code>net.topology.script.file.name</code>. If topology.script.file.name is
not set, the rack id <code>/default-rack</code> is returned for any
passed IP address. The additional configuration in the Map/Reduce
part is <code>mapred.cache.task.levels</code> which determines the number
Modified: hadoop/common/branches/branch-0.22/src/docs/src/documentation/content/xdocs/single_node_setup.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/docs/src/documentation/content/xdocs/single_node_setup.xml?rev=1100049&r1=1100048&r2=1100049&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/docs/src/documentation/content/xdocs/single_node_setup.xml (original)
+++ hadoop/common/branches/branch-0.22/src/docs/src/documentation/content/xdocs/single_node_setup.xml Fri May 6 04:30:42 2011
@@ -167,7 +167,7 @@
<source>
<configuration>
<property>
- <name>fs.default.name</name>
+ <name>fs.defaultFS</name>
<value>hdfs://localhost:9000</value>
</property>
</configuration>
Propchange: hadoop/common/branches/branch-0.22/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 6 04:30:42 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044
+/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Propchange: hadoop/common/branches/branch-0.22/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 6 04:30:42 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044
+/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
Propchange: hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 6 04:30:42 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044
+/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:776175-785643