Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -r 1325351:1325352 from trunk to branch-2. Fixes: MAPREDUCE-4140 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325359 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2012-04-12 16:31:15 +00:00
parent 6a23ecf03f
commit cb3d6c3d98
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -221,6 +221,9 @@ Release 0.23.3 - UNRELEASED
CONTIANER_LAUNCHED and CONTIANER_LAUNCH_FAILED events in additional CONTIANER_LAUNCHED and CONTIANER_LAUNCH_FAILED events in additional
states. (Robert Joseph Evans via sseth) states. (Robert Joseph Evans via sseth)
MAPREDUCE-4140. mapreduce classes incorrectly importing
"clover.org.apache.*" classes. (Patrick Hunt via tomwhite)
Release 0.23.2 - UNRELEASED Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

7
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/PartialJob.java
View File

@ -21,6 +21,8 @@ package org.apache.hadoop.mapreduce.v2.hs;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapreduce.Counters; import org.apache.hadoop.mapreduce.Counters;
import org.apache.hadoop.mapreduce.JobACL; import org.apache.hadoop.mapreduce.JobACL;
@ -37,9 +39,9 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authorize.AccessControlList; import org.apache.hadoop.security.authorize.AccessControlList;
import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
import clover.org.apache.log4j.Logger;
public class PartialJob implements org.apache.hadoop.mapreduce.v2.app.job.Job { public class PartialJob implements org.apache.hadoop.mapreduce.v2.app.job.Job {
private static final Log LOG = LogFactory.getLog(PartialJob.class);
private JobIndexInfo jobIndexInfo = null; private JobIndexInfo jobIndexInfo = null;
private JobId jobId = null; private JobId jobId = null;
@ -78,8 +80,7 @@ public class PartialJob implements org.apache.hadoop.mapreduce.v2.app.job.Job {
} catch (Exception e) { } catch (Exception e) {
// Meant for use by the display UI. Exception would prevent it from being // Meant for use by the display UI. Exception would prevent it from being
// rendered.e Defaulting to KILLED // rendered.e Defaulting to KILLED
Logger.getLogger(this.getClass().getName()).warn( LOG.warn("Exception while parsing job state. Defaulting to KILLED", e);
"Exception while parsing job state. Defaulting to KILLED", e);
js = JobState.KILLED; js = JobState.KILLED;
} }
return js; return js;

4
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetDelegationTokenRequest.java
View File

@ -21,11 +21,9 @@ package org.apache.hadoop.yarn.api.protocolrecords;
import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving; import org.apache.hadoop.classification.InterfaceStability.Evolving;
import clover.org.apache.velocity.runtime.resource.ResourceManager;
/** /**
* The request issued by the client to get a delegation token from * The request issued by the client to get a delegation token from
* the {@link ResourceManager}. * the {@code ResourceManager}.
* for more information. * for more information.
*/ */
@Public @Public

2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java
View File

@ -55,8 +55,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import clover.org.jfree.util.Log;
import com.google.inject.Guice; import com.google.inject.Guice;
import com.google.inject.Injector; import com.google.inject.Injector;
import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.GuiceServletContextListener;