Author: suresh
Date: Mon Mar 25 18:08:36 2013
New Revision: 1460800
URL: http://svn.apache.org/r1460800
Log:
HADOOP-9408. Merge change r1457015 from trunk.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1460800&r1=1460799&r2=1460800&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Mon Mar 25 18:08:36 2013
@@ -99,11 +99,15 @@ Release 2.0.4-alpha - UNRELEASED
HADOOP-9406. hadoop-client leaks dependency on JDK tools jar. (tucu)
- HADOOP-9301. hadoop client servlet/jsp/jetty/tomcat JARs creating
conflicts in Oozie & HttpFS. (tucu)
+ HADOOP-9301. hadoop client servlet/jsp/jetty/tomcat JARs creating
+ conflicts in Oozie & HttpFS. (tucu)
HADOOP-9299. kerberos name resolution is kicking in even when kerberos
is not configured (daryn)
+ HADOOP-9408. misleading description for net.topology.table.file.name
+ property in core-default.xml. (rajeshbabu via suresh)
+
Release 2.0.3-alpha - 2013-02-06
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml?rev=1460800&r1=1460799&r2=1460800&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
Mon Mar 25 18:08:36 2013
@@ -685,7 +685,7 @@
<name>net.topology.table.file.name</name>
<value></value>
<description> The file name for a topology file, which is used when the
- net.topology.script.file.name property is set to
+ net.topology.node.switch.mapping.impl property is set to
org.apache.hadoop.net.TableMapping. The file format is a two column text
file, with columns separated by whitespace. The first column is a DNS or
IP address and the second column specifies the rack where the address maps.
