svn commit: r1079195 - /hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java

[om...@apache.org]

Author: omalley
Date: Tue Mar  8 05:54:27 2011
New Revision: 1079195

URL: http://svn.apache.org/viewvc?rev=1079195&view=rev
Log:
commit 2de31b9f11b3c652ae1cb26acb2aaf902e1df96c
Author: Luke Lu <ll...@yahoo-inc.com>
Date:   Thu Sep 16 16:02:17 2010 -0700

    MAPREDUCE-2077. Fix name clash in MemoryCalculatorPlugin

Modified:
    hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java

Modified: hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java?rev=1079195&r1=1079194&r2=1079195&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java Tue Mar  8 05:54:27 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