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 wh...@apache.org on 2014/04/25 00:55:25 UTC
svn commit: r1589904 - in
/hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
Author: wheat9
Date: Thu Apr 24 22:55:25 2014
New Revision: 1589904
URL: http://svn.apache.org/r1589904
Log:
MAPREDUCE-5837. Merge r1589903 from trunk.
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1589904&r1=1589903&r2=1589904&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu Apr 24 22:55:25 2014
@@ -51,6 +51,8 @@ Release 2.5.0 - UNRELEASED
MAPREDUCE-5846. Rumen doesn't understand JobQueueChangedEvent (Nathan Roberts via raviprak)
+ MAPREDUCE-5837. MRAppMaster fails when checking on uber mode. (wheat9)
+
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java?rev=1589904&r1=1589903&r2=1589904&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java Thu Apr 24 22:55:25 2014
@@ -1288,6 +1288,7 @@ public class JobImpl implements org.apac
}
} catch (ClassNotFoundException cnfe) {
// don't care; assume it's not derived from ChainMapper
+ } catch (NoClassDefFoundError ignored) {
}
try {
String reduceClassName = conf.get(MRJobConfig.REDUCE_CLASS_ATTR);
@@ -1298,6 +1299,7 @@ public class JobImpl implements org.apac
}
} catch (ClassNotFoundException cnfe) {
// don't care; assume it's not derived from ChainReducer
+ } catch (NoClassDefFoundError ignored) {
}
return isChainJob;
}