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 sz...@apache.org on 2012/06/18 20:20:42 UTC
svn commit: r1351444 - in
/hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt
src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java
src/main/resources/core-default.xml
Author: szetszwo
Date: Mon Jun 18 18:20:41 2012
New Revision: 1351444
URL: http://svn.apache.org/viewvc?rev=1351444&view=rev
Log:
Revert r1351163 for fixing the JIRA number; it should be HADOOP-8470 but not HADOOP-8468.
Removed:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1351444&r1=1351443&r2=1351444&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jun 18 18:20:41 2012
@@ -12,9 +12,6 @@ Trunk (unreleased changes)
HADOOP-8469. Make NetworkTopology class pluggable. (Junping Du via
szetszwo)
- HADOOP-8468. Add NetworkTopologyWithNodeGroup, a 4-layer implementation
- of NetworkTopology. (Junping Du via szetszwo)
-
IMPROVEMENTS
HADOOP-8017. Configure hadoop-main pom to get rid of M2E plugin execution
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml?rev=1351444&r1=1351443&r2=1351444&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml Mon Jun 18 18:20:41 2012
@@ -599,9 +599,10 @@
</description>
</property>
-<!-- Topology Configuration -->
+<!-- Rack Configuration -->
+
<property>
- <name>net.topology.node.switch.mapping.impl</name>
+ <name>net.topology.node.switch.mapping.impl</name>
<value>org.apache.hadoop.net.ScriptBasedMapping</value>
<description> The default implementation of the DNSToSwitchMapping. It
invokes a script specified in net.topology.script.file.name to resolve
@@ -611,13 +612,6 @@
</property>
<property>
- <name>net.topology.impl</name>
- <value>org.apache.hadoop.net.NetworkTopology</value>
- <description> The default implementation of NetworkTopology which is classic three layer one.
- </description>
-</property>
-
-<property>
<name>net.topology.script.file.name</name>
<value></value>
<description> The script name that should be invoked to resolve DNS names to