You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by sh...@apache.org on 2011/02/04 04:02:59 UTC
svn commit: r1067070 - in /hadoop/mapreduce/branches/branch-0.22:
CHANGES.txt SecurityAuth.audit
src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java
Author: shv
Date: Fri Feb 4 03:02:58 2011
New Revision: 1067070
URL: http://svn.apache.org/viewvc?rev=1067070&view=rev
Log:
MAPREDUCE-2077. Merge 1067068 from trunk to branch 0.22.
Added:
hadoop/mapreduce/branches/branch-0.22/SecurityAuth.audit
Modified:
hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java
Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1067070&r1=1067069&r2=1067070&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Fri Feb 4 03:02:58 2011
@@ -460,6 +460,9 @@ Release 0.22.0 - Unreleased
MAPREDUCE-2200. TestUmbilicalProtocolWithJobToken is failing without Krb
environment: needs to be conditional. (Konstantin Boudnik via todd)
+ MAPREDUCE-2077. Resolve name clash in the deprecated
+ o.a.h.util.MemoryCalculatorPlugin (Luke Lu via shv)
+
Release 0.21.1 - Unreleased
NEW FEATURES
Added: hadoop/mapreduce/branches/branch-0.22/SecurityAuth.audit
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/SecurityAuth.audit?rev=1067070&view=auto
==============================================================================
(empty)
Modified: hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java?rev=1067070&r1=1067069&r2=1067070&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java (original)
+++ hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java Fri Feb 4 03:02:58 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