Author: suresh
Date: Thu Jan 3 21:31:02 2013
New Revision: 1428604
URL: http://svn.apache.org/viewvc?rev=1428604&view=rev
Log:
Merging trunk to branch-trunk-win
Added:
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestJobClient.java
- copied unchanged from r1428601,
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestJobClient.java
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/ (props
changed)
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/conf/
(props changed)
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(props changed)
Propchange: hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1428156-1428601
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/CHANGES.txt?rev=1428604&r1=1428603&r2=1428604&view=diff
==============================================================================
---
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/CHANGES.txt
Thu Jan 3 21:31:02 2013
@@ -656,6 +656,9 @@ Release 0.23.6 - UNRELEASED
MAPREDUCE-4813. AM timing out during job commit (jlowe via bobby)
+ MAPREDUCE-4279. getClusterStatus() fails with null pointer exception when
+ running jobs in local mode (Devaraj K via bobby)
+
Release 0.23.5 - UNRELEASED
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1428156-1428601
Propchange:
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1428156-1428601
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java?rev=1428604&r1=1428603&r2=1428604&view=diff
==============================================================================
---
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java
(original)
+++
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java
Thu Jan 3 21:31:02 2013
@@ -67,7 +67,6 @@ import com.google.common.util.concurrent
/** Implements MapReduce locally, in-process, for debugging. */
@InterfaceAudience.Private
@InterfaceStability.Unstable
-@SuppressWarnings("deprecation")
public class LocalJobRunner implements ClientProtocol {
public static final Log LOG =
LogFactory.getLog(LocalJobRunner.class);
@@ -686,7 +685,7 @@ public class LocalJobRunner implements C
*/
public TaskTrackerInfo[] getActiveTrackers()
throws IOException, InterruptedException {
- return null;
+ return new TaskTrackerInfo[0];
}
/**
@@ -695,7 +694,7 @@ public class LocalJobRunner implements C
*/
public TaskTrackerInfo[] getBlacklistedTrackers()
throws IOException, InterruptedException {
- return null;
+ return new TaskTrackerInfo[0];
}
public TaskCompletionEvent[] getTaskCompletionEvents(
Propchange:
hadoop/common/branches/branch-trunk-win/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1428156-1428601
