hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r699093 - in /hadoop/core/branches/branch-0.19: CHANGES.txt bin/hadoop src/examples/org/apache/hadoop/examples/Sort.java src/mapred/org/apache/hadoop/mapred/lib/InputSampler.java src/tools/org/apache/hadoop/tools/InputSampler.java
Date Thu, 25 Sep 2008 21:14:34 GMT
Author: omalley
Date: Thu Sep 25 14:14:34 2008
New Revision: 699093

URL: http://svn.apache.org/viewvc?rev=699093&view=rev
Log:
HADOOP-4247. Merge -r 699091:699092 from trunk to branch 0.19.

Added:
    hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/lib/InputSampler.java
      - copied unchanged from r699092, hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/lib/InputSampler.java
Removed:
    hadoop/core/branches/branch-0.19/src/tools/org/apache/hadoop/tools/InputSampler.java
Modified:
    hadoop/core/branches/branch-0.19/CHANGES.txt
    hadoop/core/branches/branch-0.19/bin/hadoop
    hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/Sort.java

Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=699093&r1=699092&r2=699093&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Thu Sep 25 14:14:34 2008
@@ -724,8 +724,14 @@
     HADOOP-4249. Fix eclipse path to include the hsqldb.jar. (szetszwo via
     omalley)
 
+<<<<<<< .working
     HADOOP-4116. Balancer should provide better resource management. (hairong)
 
+=======
+    HADOOP-4247. Move InputSampler into org.apache.hadoop.mapred.lib, so that
+    examples.jar doesn't depend on tools.jar. (omalley)
+
+>>>>>>> .merge-right.r699092
 Release 0.18.1 - 2008-09-17
 
   IMPROVEMENTS

Modified: hadoop/core/branches/branch-0.19/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/bin/hadoop?rev=699093&r1=699092&r2=699093&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/bin/hadoop (original)
+++ hadoop/core/branches/branch-0.19/bin/hadoop Thu Sep 25 14:14:34 2008
@@ -224,8 +224,7 @@
   CLASSPATH=${CLASSPATH}:${TOOL_PATH}
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "sampler" ] ; then
-  CLASS=org.apache.hadoop.tools.InputSampler
-  CLASSPATH=${CLASSPATH}:${TOOL_PATH}
+  CLASS=org.apache.hadoop.mapred.lib.InputSampler
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 else
   CLASS=$COMMAND

Modified: hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/Sort.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/Sort.java?rev=699093&r1=699092&r2=699093&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/Sort.java (original)
+++ hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/Sort.java Thu
Sep 25 14:14:34 2008
@@ -32,8 +32,8 @@
 import org.apache.hadoop.mapred.*;
 import org.apache.hadoop.mapred.lib.IdentityMapper;
 import org.apache.hadoop.mapred.lib.IdentityReducer;
+import org.apache.hadoop.mapred.lib.InputSampler;
 import org.apache.hadoop.mapred.lib.TotalOrderPartitioner;
-import org.apache.hadoop.tools.InputSampler;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
 



Mime
View raw message