MAPREDUCE-2077. Resolve name clash in the deprecated o.a.h.util.MemoryCalculatorPlugin Contributed by Luke Lu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1067068 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index ed60d32..8d3130a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -532,6 +532,9 @@
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
diff --git a/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java b/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java
index 2966cd8..59c01a7 100644
--- a/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java
+++ b/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java
@@ -20,7 +20,6 @@
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 @@
@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
