Author: szetszwo
Date: Mon Jun 3 04:05:41 2013
New Revision: 1488839
URL: http://svn.apache.org/r1488839
Log:
svn merge -c 1351445 from trunk for HADOOP-8470. Add
NetworkTopologyWithNodeGroup, a 4-layer implementation of NetworkTopology.
Modified:
hadoop/common/branches/branch-2/ (props changed)
hadoop/common/branches/branch-2/hadoop-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-project/src/site/ (props changed)
Propchange: hadoop/common/branches/branch-2/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1351445
Propchange: hadoop/common/branches/branch-2/hadoop-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-project:r1351445
Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-project/src/site:r1351445
