YARN-2081. Fixed TestDistributedShell failure after YARN-1962. Contributed by Zhiguo Hong.
svn merge --ignore-ancestry -c 1596724 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596725 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
1ad5343c1f
commit
e4f164245a
|
@ -225,6 +225,9 @@ Release 2.4.1 - UNRELEASED
|
|||
YARN-2066. Wrong field is referenced in GetApplicationsRequestPBImpl#mergeLocalToBuilder()
|
||||
(Hong Zhiguo via junping_du)
|
||||
|
||||
YARN-2081. Fixed TestDistributedShell failure after YARN-1962. (Zhiguo Hong
|
||||
via zjshen)
|
||||
|
||||
Release 2.4.0 - 2014-04-07
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -73,6 +73,7 @@ public class TestDistributedShell {
|
|||
conf.setClass(YarnConfiguration.RM_SCHEDULER,
|
||||
FifoScheduler.class, ResourceScheduler.class);
|
||||
conf.set("yarn.log.dir", "target");
|
||||
conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
|
||||
if (yarnCluster == null) {
|
||||
yarnCluster = new MiniYARNCluster(
|
||||
TestDistributedShell.class.getSimpleName(), 1, 1, 1, 1, true);
|
||||
|
|
Loading…
Reference in New Issue