hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject svn commit: r1067068 - in /hadoop/mapreduce/trunk: CHANGES.txt src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java
Date Fri, 04 Feb 2011 02:54:56 GMT
Author: shv
Date: Fri Feb  4 02:54:56 2011
New Revision: 1067068

URL: http://svn.apache.org/viewvc?rev=1067068&view=rev
Log:
MAPREDUCE-2077. Resolve name clash in the deprecated o.a.h.util.MemoryCalculatorPlugin Contributed
by Luke Lu.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1067068&r1=1067067&r2=1067068&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Feb  4 02:54:56 2011
@@ -532,6 +532,9 @@ Release 0.22.0 - Unreleased
     MAPREDUCE-2200. TestUmbilicalProtocolWithJobToken is failing without Krb
     evironment: needs to be conditional. (cos)
 
+    MAPREDUCE-2077. Resolve name clash in the deprecated 
+    o.a.h.util.MemoryCalculatorPlugin (Luke Lu via shv)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java?rev=1067068&r1=1067067&r2=1067068&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java Fri
Feb  4 02:54:56 2011
@@ -20,7 +20,6 @@ package org.apache.hadoop.util;
 
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.conf.Configuration;
 
 /**
  * Plugin to calculate virtual and physical memories on the system.
@@ -35,10 +34,4 @@ import org.apache.hadoop.conf.Configurat
 @InterfaceStability.Unstable
 public abstract class MemoryCalculatorPlugin extends
     org.apache.hadoop.mapreduce.util.MemoryCalculatorPlugin {
-
-  public static MemoryCalculatorPlugin getMemoryCalculatorPlugin(
-      Class<? extends MemoryCalculatorPlugin> clazz, Configuration conf) {
-    return (MemoryCalculatorPlugin) org.apache.hadoop.mapreduce.util.MemoryCalculatorPlugin
-        .getMemoryCalculatorPlugin(clazz, conf);
-  }
 }
\ No newline at end of file



Mime
View raw message